diff options
| author | louiz <louiz@louiz.org> | 2017-03-10 11:24:27 +0100 |
|---|---|---|
| committer | louiz <louiz@louiz.org> | 2017-03-10 11:24:27 +0100 |
| commit | 4d42dddf465f22af795456056b64863e19f16e8e (patch) | |
| tree | 35013526c43e72f36f988c6e04e23fa771292f84 /louloulibs/CMakeLists.txt | |
| parent | d44125371fb9f170ea708e96682ad376a45fc293 (diff) | |
| parent | 2b6b577375cad899bcd4c00b8ea91fb5ef4c907c (diff) | |
| download | biboumi-4d42dddf465f22af795456056b64863e19f16e8e.tar.gz biboumi-4d42dddf465f22af795456056b64863e19f16e8e.tar.bz2 biboumi-4d42dddf465f22af795456056b64863e19f16e8e.tar.xz biboumi-4d42dddf465f22af795456056b64863e19f16e8e.zip | |
Merge branch 'cmake_remove_libs' into 'master'
cmake: Remove the intermediate static libs
See merge request !7
Diffstat (limited to 'louloulibs/CMakeLists.txt')
| -rw-r--r-- | louloulibs/CMakeLists.txt | 35 |
1 files changed, 9 insertions, 26 deletions
diff --git a/louloulibs/CMakeLists.txt b/louloulibs/CMakeLists.txt index 2268571..e1e402f 100644 --- a/louloulibs/CMakeLists.txt +++ b/louloulibs/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 3.0) set(${PROJECT_NAME}_VERSION_MAJOR 1) set(${PROJECT_NAME}_VERSION_MINOR 0) @@ -51,8 +51,11 @@ include_directories(${ICONV_INCLUDE_DIRS}) include_directories(${LIBUUID_INCLUDE_DIRS}) set(EXPAT_INCLUDE_DIRS ${EXPAT_INCLUDE_DIRS} PARENT_SCOPE) +set(EXPAT_LIBRARIES ${EXPAT_LIBRARIES} PARENT_SCOPE) set(ICONV_INCLUDE_DIRS ${ICONV_INCLUDE_DIRS} PARENT_SCOPE) +set(ICONV_LIBRARIES ${ICONV_LIBRARIES} PARENT_SCOPE) set(LIBUUID_INCLUDE_DIRS ${LIBUUID_INCLUDE_DIRS} PARENT_SCOPE) +set(LIBUUID_LIBRARIES ${LIBUUID_LIBRARIES} PARENT_SCOPE) if(LIBIDN_FOUND) include_directories(${LIBIDN_INCLUDE_DIRS}) @@ -99,55 +102,35 @@ endif() # file(GLOB source_utils utils/*.[hc]pp) -add_library(utils STATIC ${source_utils}) -target_link_libraries(utils ${ICONV_LIBRARIES}) +set(source_utils ${source_utils} PARENT_SCOPE) # ## config # file(GLOB source_config config/*.[hc]pp) -add_library(config STATIC ${source_config}) +set(source_config ${source_config} PARENT_SCOPE) # ## logger # file(GLOB source_logger logger/*.[hc]pp) -add_library(logger STATIC ${source_logger}) -target_link_libraries(logger config) +set(source_logger ${source_logger} PARENT_SCOPE) # ## network # file(GLOB source_network network/*.[hc]pp) -add_library(network STATIC ${source_network}) -target_link_libraries(network logger) -if(BOTAN_FOUND) - target_link_libraries(network ${BOTAN_LIBRARIES}) -elseif(GCRYPT_FOUND) - target_link_libraries(network ${GCRYPT_LIBRARIES}) -endif() -if(UDNS_FOUND) - target_link_libraries(network ${UDNS_LIBRARIES}) -endif() +set(source_network ${source_network} PARENT_SCOPE) # ## xmpplib # file(GLOB source_xmpplib xmpp/*.[hc]pp) -add_library(xmpplib STATIC ${source_xmpplib}) -target_link_libraries(xmpplib network utils logger - ${EXPAT_LIBRARIES} - ${LIBUUID_LIBRARIES}) -if(LIBIDN_FOUND) - target_link_libraries(xmpplib ${LIBIDN_LIBRARIES}) -endif() -if(SYSTEMD_FOUND) - target_link_libraries(xmpplib ${SYSTEMD_LIBRARIES}) -endif() +set(source_xmpplib ${source_xmpplib} PARENT_SCOPE) # Define a __FILENAME__ macro with the relative path (from the base project directory) # of each source file |