Skip to content

Commit 3b3eec5

Browse files
committed
Fix mysql build flag
1 parent f4128ea commit 3b3eec5

4 files changed

Lines changed: 7 additions & 7 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
-DCMAKE_PREFIX_PATH="/opt/homebrew/opt/postgresql@16;C:\Program Files\PostgreSQL\16"
6565
-DENABLE_MAINTAINER_CFLAGS=${{ matrix.build_type == 'Debug' }}
6666
-DBUILD_SHARED_LIBS=ON
67-
-DDRIVER_MYSQL=${{ runner.os == 'Linux' }}
67+
-DASQL_DRIVER_MYSQL=${{ runner.os == 'Linux' }}
6868
-DASQL_DRIVER_ODBC=${{ runner.os == 'Linux' }}
6969
7070
- name: Build project
@@ -87,7 +87,7 @@ jobs:
8787
-DCMAKE_BUILD_TYPE=Debug
8888
-DCMAKE_PREFIX_PATH="/opt/homebrew/opt/postgresql@16;C:\Program Files\PostgreSQL\16"
8989
-DBUILD_SHARED_LIBS=OFF
90-
-DDRIVER_MYSQL=${{ runner.os == 'Linux' }}
90+
-DASQL_DRIVER_MYSQL=${{ runner.os == 'Linux' }}
9191
-DASQL_DRIVER_ODBC=${{ runner.os == 'Linux' }}
9292
9393
- name: Build project

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ if (ASQL_DRIVER_POSTGRES)
6969
find_package(PostgreSQL REQUIRED)
7070
endif ()
7171

72-
option(DRIVER_MYSQL "Enable MySQL Driver" ON)
73-
if (DRIVER_MYSQL)
72+
option(ASQL_DRIVER_MYSQL "Enable MySQL Driver" ON)
73+
if (ASQL_DRIVER_MYSQL)
7474
find_package(MySQL REQUIRED)
7575
endif ()
7676

demos/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ if (ASQL_DRIVER_SQLITE)
99
add_subdirectory(sqlite)
1010
endif()
1111

12-
if (DRIVER_MYSQL)
12+
if (ASQL_DRIVER_MYSQL)
1313
add_subdirectory(mysql)
1414
endif()

src/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ if (ASQL_DRIVER_POSTGRES)
213213
endif() # End Postgres Driver
214214

215215
## MySQL Driver
216-
if (DRIVER_MYSQL)
216+
if (ASQL_DRIVER_MYSQL)
217217
set(asql_mysql_SRC
218218
adrivermysql.cpp
219219
adrivermysql.h
@@ -432,7 +432,7 @@ if (ASQL_MIGRATION_TOOL)
432432
target_link_libraries(${TARGET_ASQL_MIGRATION_CMD} PRIVATE ASql::Odbc)
433433
target_compile_definitions(${TARGET_ASQL_MIGRATION_CMD} PRIVATE DRIVER_ODBC)
434434
endif()
435-
if (DRIVER_MYSQL)
435+
if (ASQL_DRIVER_MYSQL)
436436
target_link_libraries(${TARGET_ASQL_MIGRATION_CMD} PRIVATE ASql::Mysql)
437437
target_compile_definitions(${TARGET_ASQL_MIGRATION_CMD} PRIVATE DRIVER_MYSQL)
438438
endif()

0 commit comments

Comments
 (0)