diff --git a/CMakeLists.txt b/CMakeLists.txt index 92cf7698f79f625555b001416114cafe92d26d5e..11d7ee164d87c6b4331ca6f89231b3d59cc25f2f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,9 +13,13 @@ find_package(cppunit) if (NOT CMAKE_COMPILER_IS_GNUCXX) ADD_SUBDIRECTORY(msvc-deps) else() +if (WIN32) +ADD_SUBDIRECTORY(msvc-deps/sqlite3) +else() set(sqlite3_DIR "${CMAKE_SOURCE_DIR}/cmake_modules") find_package(sqlite3) endif() +endif() set(mysql_DIR "${CMAKE_SOURCE_DIR}/cmake_modules") find_package(mysql) @@ -120,7 +124,6 @@ else (SQLITE3_FOUND) if (WIN32) ADD_DEFINITIONS(-DWITH_SQLITE) include_directories(msvc-deps/sqlite3) - set (SQLITE3_LIBRARIES "${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3/sqlite3.lib") message("SQLite3 : bundled") else() set(SQLITE3_LIBRARIES "")