From 0cf6ce5de219d15ae933e9d1c66c88e8c348e8fa Mon Sep 17 00:00:00 2001 From: Frank Zschockelt Date: Sun, 31 Jan 2016 15:42:32 +0100 Subject: [PATCH 1/3] Add all symbols to the dynamic linker symbol table spectrum2 uses them to check for its compiled-in frontends. --- spectrum/src/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spectrum/src/CMakeLists.txt b/spectrum/src/CMakeLists.txt index d97d27ea..280539ad 100644 --- a/spectrum/src/CMakeLists.txt +++ b/spectrum/src/CMakeLists.txt @@ -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 From f747ef0b85f921a7de648710f077aa7a6726622c Mon Sep 17 00:00:00 2001 From: Frank Zschockelt Date: Sun, 31 Jan 2016 15:56:54 +0100 Subject: [PATCH 2/3] Always set MG_ENABLE_SSL mg_set_ssl() isn't used conditionally, so the necessary define shouldn't be set conditionally either. --- spectrum_manager/src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spectrum_manager/src/CMakeLists.txt b/spectrum_manager/src/CMakeLists.txt index bccf7a6b..ab0c5ed1 100644 --- a/spectrum_manager/src/CMakeLists.txt +++ b/spectrum_manager/src/CMakeLists.txt @@ -8,8 +8,8 @@ SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/../../include/transport/ 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() From 8fd7f81b19464b0ea11ac9bb33b4184575921916 Mon Sep 17 00:00:00 2001 From: Frank Zschockelt Date: Sun, 31 Jan 2016 16:29:45 +0100 Subject: [PATCH 3/3] Check explicitly for MSVC to fix the compilation with clang --- backends/libpurple/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backends/libpurple/CMakeLists.txt b/backends/libpurple/CMakeLists.txt index f31b1a72..cbf2575b 100644 --- a/backends/libpurple/CMakeLists.txt +++ b/backends/libpurple/CMakeLists.txt @@ -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)