libtransport.git Changeset - c49512252a4c

Changeset - c49512252a4c

Parent rev.

Child rev.

[Not reviewed]

Merge

0 4 0

Jan Kaluza - 9 years ago 2016-02-02 10:17:26
jkaluza@redhat.com

Merge branch 'master' of github.com:hanzz/libtransport

3 files changed with 9 insertions and 4 deletions:

backends/libpurple/CMakeLists.txt

spectrum/src/CMakeLists.txt

spectrum_manager/src/CMakeLists.txt

0 comments (0 inline, 0 general)

backends/libpurple/CMakeLists.txt

➞

Show inline comments

@@ @@ -3,14 +3,14 @@ FILE(GLOB SRC *.cpp) @@
 ADD_EXECUTABLE(spectrum2_libpurple_backend ${SRC})
 if(CMAKE_COMPILER_IS_GNUCXX)
 if(MSVC)
 target_link_libraries(spectrum2_libpurple_backend sqlite3 ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${LIBXML2_LIBRARIES} ${EVENT_LIBRARIES} transport-plugin ${PROTOBUF_LIBRARY})
 else()
 	if (NOT WIN32)
 	target_link_libraries(spectrum2_libpurple_backend ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${EVENT_LIBRARIES} transport-plugin pthread)
 	else()
 	target_link_libraries(spectrum2_libpurple_backend ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${EVENT_LIBRARIES} transport-plugin)
 	endif()
 else()
 target_link_libraries(spectrum2_libpurple_backend sqlite3 ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${LIBXML2_LIBRARIES} ${EVENT_LIBRARIES} transport-plugin ${PROTOBUF_LIBRARY})
 endif()
 INSTALL(TARGETS spectrum2_libpurple_backend RUNTIME DESTINATION bin)

spectrum/src/CMakeLists.txt

➞

Show inline comments

@@ @@ -25,6 +25,11 @@ else () @@
 target_link_libraries(spectrum2 transport spectrum2-xmpp-frontend spectrum2-slack-frontend ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY})
 endif()
 if (NOT MSVC)
 # export all symbols (used for loading frontends)
 set(CMAKE_EXE_LINKER_FLAGS "-Wl,-export-dynamic")
 endif()
 INSTALL(TARGETS spectrum2 RUNTIME DESTINATION bin)
 INSTALL(FILES

spectrum_manager/src/CMakeLists.txt

➞

Show inline comments

 target_link_libraries(spectrum2_manager transport ${SWIFTEN_LIBRARY} ${PROTOBUF_LIBRARIES})
 if (CMAKE_COMPILER_IS_GNUCXX)
 add_definitions(-DMG_ENABLE_SSL)
 if (CMAKE_COMPILER_IS_GNUCXX)
 target_link_libraries(spectrum2_manager ${OPENSSL_LIBRARIES})
 endif()

0 comments (0 inline, 0 general)