Skip to content

Commit f16b320

Browse files
committed
Not clearing SQL_LIBRARIES so that more libraries can be specified by command line.
1 parent e82ff35 commit f16b320

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

CMakeLists.txt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W -Wall")
5858
# enable use of "make test"
5959
enable_testing()
6060

61-
# Find SQL libraries
62-
set(SQL_LIBRARIES "")
61+
### Find SQL libraries ###
6362

6463
# Find PostgreSQL client library
6564

@@ -70,7 +69,7 @@ if(WITH_POSTGRESQL)
7069
find_package(PostgreSQL)
7170

7271
if(PostgreSQL_FOUND)
73-
set(SQL_LIBRARIES ${SQL_LIBRARIES} ${PostgreSQL_LIBRARIES})
72+
set(SQL_LIBRARIES ${PostgreSQL_LIBRARIES} ${SQL_LIBRARIES})
7473
add_definitions(-DHAVE_POSTGRESQL=1)
7574
message(STATUS "Found PostgreSQL: ${PostgreSQL_LIBRARIES}")
7675
include_directories(${PostgreSQL_INCLUDE_DIRS})
@@ -93,7 +92,7 @@ if(WITH_MYSQL)
9392
add_definitions(-DHAVE_MYSQL=1)
9493
message(STATUS "Found MySQL: ${MYSQL_LIBRARIES}")
9594
include_directories(${MYSQL_INCLUDE_DIRS})
96-
set(SQL_LIBRARIES ${SQL_LIBRARIES} ${MYSQL_LIBRARIES})
95+
set(SQL_LIBRARIES ${MYSQL_LIBRARIES} ${SQL_LIBRARIES})
9796
else()
9897
set(MYSQL_FOUND FALSE)
9998
message(STATUS "Could NOT find MySQL library")
@@ -114,7 +113,7 @@ if(SQLITE3_INCLUDE_DIRS AND SQLITE3_LIBRARIES)
114113
add_definitions(-DHAVE_SQLITE3=1)
115114
message(STATUS "Found SQLite3: ${SQLITE3_LIBRARIES}")
116115
include_directories(${SQLITE3_INCLUDE_DIRS})
117-
set(SQL_LIBRARIES ${SQL_LIBRARIES} ${SQLITE3_LIBRARIES})
116+
set(SQL_LIBRARIES ${SQLITE3_LIBRARIES} ${SQL_LIBRARIES})
118117
else()
119118
set(SQLITE3_FOUND FALSE)
120119
message(SEND_ERROR "Could NOT find SQLite3 library. It is required!")

0 commit comments

Comments
 (0)