From f16b32011667e995b9a7f98f5dd19cfe4b992a03 Mon Sep 17 00:00:00 2001 From: Timo Bingmann Date: Tue, 3 Jun 2014 01:19:03 +0200 Subject: [PATCH] Not clearing SQL_LIBRARIES so that more libraries can be specified by command line. --- CMakeLists.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a309b7b..484a55e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,8 +58,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W -Wall") # enable use of "make test" enable_testing() -# Find SQL libraries -set(SQL_LIBRARIES "") +### Find SQL libraries ### # Find PostgreSQL client library @@ -70,7 +69,7 @@ if(WITH_POSTGRESQL) find_package(PostgreSQL) if(PostgreSQL_FOUND) - set(SQL_LIBRARIES ${SQL_LIBRARIES} ${PostgreSQL_LIBRARIES}) + set(SQL_LIBRARIES ${PostgreSQL_LIBRARIES} ${SQL_LIBRARIES}) add_definitions(-DHAVE_POSTGRESQL=1) message(STATUS "Found PostgreSQL: ${PostgreSQL_LIBRARIES}") include_directories(${PostgreSQL_INCLUDE_DIRS}) @@ -93,7 +92,7 @@ if(WITH_MYSQL) add_definitions(-DHAVE_MYSQL=1) message(STATUS "Found MySQL: ${MYSQL_LIBRARIES}") include_directories(${MYSQL_INCLUDE_DIRS}) - set(SQL_LIBRARIES ${SQL_LIBRARIES} ${MYSQL_LIBRARIES}) + set(SQL_LIBRARIES ${MYSQL_LIBRARIES} ${SQL_LIBRARIES}) else() set(MYSQL_FOUND FALSE) message(STATUS "Could NOT find MySQL library") @@ -114,7 +113,7 @@ if(SQLITE3_INCLUDE_DIRS AND SQLITE3_LIBRARIES) add_definitions(-DHAVE_SQLITE3=1) message(STATUS "Found SQLite3: ${SQLITE3_LIBRARIES}") include_directories(${SQLITE3_INCLUDE_DIRS}) - set(SQL_LIBRARIES ${SQL_LIBRARIES} ${SQLITE3_LIBRARIES}) + set(SQL_LIBRARIES ${SQLITE3_LIBRARIES} ${SQL_LIBRARIES}) else() set(SQLITE3_FOUND FALSE) message(SEND_ERROR "Could NOT find SQLite3 library. It is required!")