libtransport.git Changeset - 301018ab3045

Changeset - 301018ab3045

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Vitaly Takmazov - 13 years ago 2012-12-10 10:05:05
vitalyster@gmail.com

Fixed compilation of sqlite3 target

3 files changed with 5 insertions and 3 deletions:

msvc-deps/sqlite3/CMakeLists.txt

spectrum/src/CMakeLists.txt

src/CMakeLists.txt

0 comments (0 inline, 0 general)

msvc-deps/sqlite3/CMakeLists.txt

➞

Show inline comments

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

spectrum/src/CMakeLists.txt

➞

Show inline comments

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

src/CMakeLists.txt

➞

Show inline comments

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

0 comments (0 inline, 0 general)