From 301018ab3045979fb2185d5be7106127945db82e Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Mon, 10 Dec 2012 13:05:05 +0400 Subject: [PATCH] Fixed compilation of sqlite3 target --- msvc-deps/sqlite3/CMakeLists.txt | 4 ++-- spectrum/src/CMakeLists.txt | 3 ++- src/CMakeLists.txt | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/msvc-deps/sqlite3/CMakeLists.txt b/msvc-deps/sqlite3/CMakeLists.txt index 8ae6ac14..7c940e54 100644 --- a/msvc-deps/sqlite3/CMakeLists.txt +++ b/msvc-deps/sqlite3/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -FILE(GLOB SRC *.c *.h) +FILE(GLOB SQLITE_SRC *.c *.h) -ADD_LIBRARY(sqlite3 STATIC ${HEADERS} ${SRC}) +ADD_LIBRARY(sqlite3 STATIC ${HEADERS} ${SQLITE_SRC}) INSTALL(TARGETS sqlite3 LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries) \ No newline at end of file diff --git a/spectrum/src/CMakeLists.txt b/spectrum/src/CMakeLists.txt index fb38f5f0..8a289963 100644 --- a/spectrum/src/CMakeLists.txt +++ b/spectrum/src/CMakeLists.txt @@ -4,6 +4,7 @@ FILE(GLOB SRC *.cpp) if (WIN32) FILE(GLOB WIN_SRC win32/*.cpp) include_directories(win32) +include_directories("${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3") ADD_EXECUTABLE(spectrum2 ${SRC} ${WIN_SRC}) else() ADD_EXECUTABLE(spectrum2 ${SRC}) @@ -14,7 +15,7 @@ endif() ADD_DEPENDENCIES(spectrum2 spectrum2_libpurple_backend) ADD_DEPENDENCIES(spectrum2 spectrum2_libircclient-qt_backend) -target_link_libraries(spectrum2 transport ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY}) +target_link_libraries(spectrum2 transport sqlite3 ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY}) INSTALL(TARGETS spectrum2 RUNTIME DESTINATION bin) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 27fbfae7..9053aa4d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -46,6 +46,7 @@ endif(PROTOBUF_FOUND) # endif() if (WIN32) + include_directories("${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3") TARGET_LINK_LIBRARIES(transport transport-plugin sqlite3 ${PQXX_LIBRARY} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY}) else() TARGET_LINK_LIBRARIES(transport transport-plugin ${PQXX_LIBRARY} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY} ${PROTOBUF_LIBRARY})