From 2153975db98b62f1941d34ac0e527dec262428e2 Mon Sep 17 00:00:00 2001 From: Alan Antonuk Date: Fri, 19 Apr 2013 14:03:20 -0700 Subject: Cleanup CMake librabbitmq target_link_libraries() Now have one variable to adjust when adding new libraries instead of adding it in 2 different places. Also make sure static rabbitmq-c links against the SSL libraries --- librabbitmq/CMakeLists.txt | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'librabbitmq/CMakeLists.txt') diff --git a/librabbitmq/CMakeLists.txt b/librabbitmq/CMakeLists.txt index 52e2682..3982b0f 100644 --- a/librabbitmq/CMakeLists.txt +++ b/librabbitmq/CMakeLists.txt @@ -127,12 +127,12 @@ add_definitions(-DAMQP_BUILD) include(InstallMacros) +set(RMQ_LIBRARIES ${AMQP_SSL_LIBS} ${SOCKET_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) + if (BUILD_SHARED_LIBS) add_library(rabbitmq SHARED ${RABBITMQ_SOURCES}) - if (ENABLE_SSL_SUPPORT) - target_link_libraries(rabbitmq ${AMQP_SSL_LIBS} ${CMAKE_THREAD_LIBS_INIT}) - endif() + target_link_libraries(rabbitmq ${RMQ_LIBRARIES}) if (WIN32) set_target_properties(rabbitmq PROPERTIES VERSION ${RMQ_VERSION} OUTPUT_NAME rabbitmq.${RMQ_SOVERSION}) @@ -140,10 +140,6 @@ if (BUILD_SHARED_LIBS) set_target_properties(rabbitmq PROPERTIES VERSION ${RMQ_VERSION} SOVERSION ${RMQ_SOVERSION}) endif (WIN32) - if (DEFINED SOCKET_LIBRARIES) - target_link_libraries(rabbitmq ${SOCKET_LIBRARIES}) - endif () - install(TARGETS rabbitmq RUNTIME DESTINATION bin LIBRARY DESTINATION lib @@ -157,6 +153,8 @@ endif (BUILD_SHARED_LIBS) if (BUILD_STATIC_LIBS) add_library(rabbitmq-static STATIC ${RABBITMQ_SOURCES}) + target_link_libraries(rabbitmq-static ${RMQ_LIBRARIES}) + set_target_properties(rabbitmq-static PROPERTIES COMPILE_DEFINITIONS AMQP_STATIC) if (WIN32) set_target_properties(rabbitmq-static PROPERTIES VERSION ${RMQ_VERSION} OUTPUT_NAME librabbitmq.${RMQ_SOVERSION}) @@ -164,10 +162,6 @@ if (BUILD_STATIC_LIBS) set_target_properties(rabbitmq-static PROPERTIES VERSION ${RMQ_VERSION} SOVERSION ${RMQ_SOVERSION} OUTPUT_NAME rabbitmq) endif (WIN32) - if (DEFINED SOCKET_LIBRARIES) - target_link_libraries(rabbitmq-static ${SOCKET_LIBRARIES}) - endif () - install(TARGETS rabbitmq-static ARCHIVE DESTINATION lib ) -- cgit v1.2.1