From 2013ed6f98c0bffdb00fe06df5dca1d1ad422305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Fri, 10 Mar 2017 10:20:03 +0100
Subject: cmake: Remove the intermediate static libs

Should compile faster (and also take less space on disk)
---
 louloulibs/CMakeLists.txt | 33 ++++++++-------------------------
 1 file changed, 8 insertions(+), 25 deletions(-)

(limited to 'louloulibs/CMakeLists.txt')

diff --git a/louloulibs/CMakeLists.txt b/louloulibs/CMakeLists.txt
index 2268571..4c37c20 100644
--- a/louloulibs/CMakeLists.txt
+++ b/louloulibs/CMakeLists.txt
@@ -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})
+add_library(utils OBJECT ${source_utils})
 
 #
 ## config
 #
 file(GLOB source_config
   config/*.[hc]pp)
-add_library(config STATIC ${source_config})
+add_library(config OBJECT ${source_config})
 
 #
 ## logger
 #
 file(GLOB source_logger
   logger/*.[hc]pp)
-add_library(logger STATIC ${source_logger})
-target_link_libraries(logger config)
+add_library(logger OBJECT ${source_logger})
 
 #
 ## 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()
+add_library(network OBJECT ${source_network})
 
 #
 ## 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()
+add_library(xmpplib OBJECT ${source_xmpplib})
 
 # Define a __FILENAME__ macro with the relative path (from the base project directory)
 # of each source file
-- 
cgit v1.2.3


From 2b6b577375cad899bcd4c00b8ea91fb5ef4c907c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Fri, 10 Mar 2017 11:11:08 +0100
Subject: cmake: do not use intermediate libraries at all (not even OBJECTS)

---
 louloulibs/CMakeLists.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'louloulibs/CMakeLists.txt')

diff --git a/louloulibs/CMakeLists.txt b/louloulibs/CMakeLists.txt
index 4c37c20..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)
@@ -102,35 +102,35 @@ endif()
 #
 file(GLOB source_utils
   utils/*.[hc]pp)
-add_library(utils OBJECT ${source_utils})
+set(source_utils ${source_utils} PARENT_SCOPE)
 
 #
 ## config
 #
 file(GLOB source_config
   config/*.[hc]pp)
-add_library(config OBJECT ${source_config})
+set(source_config ${source_config} PARENT_SCOPE)
 
 #
 ## logger
 #
 file(GLOB source_logger
   logger/*.[hc]pp)
-add_library(logger OBJECT ${source_logger})
+set(source_logger ${source_logger} PARENT_SCOPE)
 
 #
 ## network
 #
 file(GLOB source_network
   network/*.[hc]pp)
-add_library(network OBJECT ${source_network})
+set(source_network ${source_network} PARENT_SCOPE)
 
 #
 ## xmpplib
 #
 file(GLOB source_xmpplib
   xmpp/*.[hc]pp)
-add_library(xmpplib OBJECT ${source_xmpplib})
+set(source_xmpplib ${source_xmpplib} PARENT_SCOPE)
 
 # Define a __FILENAME__ macro with the relative path (from the base project directory)
 # of each source file
-- 
cgit v1.2.3