From 471f82b6691a1d229c5d63e992d9a4dc486ce9a0 Mon Sep 17 00:00:00 2001 From: Paolo Galeone Date: Wed, 28 Nov 2018 16:47:06 +0100 Subject: [PATCH] CMakeLists.txt: add_source_directory instead of add_subdirectory --- CMakeLists.txt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 50a52a8..5b43667 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,9 +51,11 @@ macro (add_sources) endmacro() # add source files -add_subdirectory(src) +#add_subdirectory(src) +aux_source_directory(src src_MAIN) if(AMQP-CPP_LINUX_TCP) - add_subdirectory(src/linux_tcp) + #add_subdirectory(src/linux_tcp) + aux_source_directory(src/linux_tcp src_LINUX_TCP) endif() # potentially build the examples @@ -77,12 +79,14 @@ set(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/bin) if(AMQP-CPP_BUILD_SHARED) # create shared lib - add_library(${PROJECT_NAME} SHARED ${SRCS}) + #add_library(${PROJECT_NAME} SHARED ${SRCS}) + add_library(${PROJECT_NAME} SHARED ${src_MAIN} ${src_LINUX_TCP}) # set shared lib version set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${SO_VERSION}) else() # create static lib - add_library(${PROJECT_NAME} STATIC ${SRCS}) + #add_library(${PROJECT_NAME} STATIC ${SRCS}) + add_library(${PROJECT_NAME} STATIC ${src_MAIN} ${src_LINUX_TCP}) endif() # install rules