stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed compilation of sqlite3 target

Browse source
This commit is contained in:
Vitaly Takmazov 2012-12-10 13:05:05 +04:00
parent ea0bc80712
commit 301018ab30
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
msvc-deps/sqlite3/CMakeLists.txt
View file

@ -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)

3
spectrum/src/CMakeLists.txt
View file

@ -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)

1
src/CMakeLists.txt
View file

@ -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})