1 files changed, 18 insertions, 105 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index df634b5..808d9e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,35 +15,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__FILENAME__='\"$(subst ${CMAKE_SOURCE
 #
 ## Look for external libraries
 #
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
-include(FindEXPAT)
-find_package(EXPAT REQUIRED)
-find_package(ICONV REQUIRED)
-find_package(LIBUUID REQUIRED)
-
-if(WITH_LIBIDN)
-  find_package(LIBIDN REQUIRED)
-elseif(NOT WITHOUT_LIBIDN)
-  find_package(LIBIDN)
-endif()
-
-if(WITH_SYSTEMD)
-  find_package(SYSTEMD REQUIRED)
-elseif(NOT WITHOUT_SYSTEMD)
-  find_package(SYSTEMD)
-endif()
-
-if(WITH_BOTAN)
-  find_package(BOTAN REQUIRED)
-elseif(NOT WITHOUT_BOTAN)
-  find_package(BOTAN)
-endif()
-
-if(WITH_CARES)
-  find_package(CARES REQUIRED)
-elseif(NOT WITHOUT_CARES)
-  find_package(CARES)
-endif()
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/")
 
 #
 ## Get the software version
@@ -68,42 +40,12 @@ if(${PROJECT_NAME}_VERSION_SUFFIX MATCHES "^~dev$")
   endif()
 endif()
 
-set(BIBOUMI_VERSION
+set(SOFTWARE_VERSION
   ${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}${${PROJECT_NAME}_VERSION_SUFFIX})
 
 # To be able to include the config.h file generated by cmake
 include_directories("${CMAKE_CURRENT_BINARY_DIR}/src/")
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src/")
-include_directories(${EXPAT_INCLUDE_DIRS})
-include_directories(${ICONV_INCLUDE_DIRS})
-include_directories(${LIBUUID_INCLUDE_DIRS})
-
-if(LIBIDN_FOUND)
-  include_directories(${LIBIDN_INCLUDE_DIRS})
-endif()
-
-if(SYSTEMD_FOUND)
-  include_directories(${SYSTEMD_INCLUDE_DIRS})
-endif()
-
-if(BOTAN_FOUND)
-  include_directories(SYSTEM ${BOTAN_INCLUDE_DIRS})
-endif()
-
-if(CARES_FOUND)
-  include_directories(${CARES_INCLUDE_DIRS})
-endif()
-
-set(POLLER_DOCSTRING "Choose the poller between POLL and EPOLL (Linux-only)")
-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
- set(POLLER "EPOLL" CACHE STRING ${POLLER_DOCSTRING})
-else()
- set(POLLER "POLL" CACHE STRING ${POLLER_DOCSTRING})
-endif()
-if((NOT ${POLLER} MATCHES "POLL") AND
-    (NOT ${POLLER} MATCHES "EPOLL"))
-  message(FATAL_ERROR "POLLER must be either POLL or EPOLL")
-endif()
 
 #
 ## Documentation
@@ -121,43 +63,21 @@ if(RONN_EXECUTABLE)
   add_custom_target(doc DEPENDS ${MAN_PAGE})
 endif()
 
-#
-## utils
-#
-file(GLOB source_utils
-  src/utils/*.[hc]pp)
-add_library(utils STATIC ${source_utils})
-target_link_libraries(utils ${ICONV_LIBRARIES})
-
-#
-## config
-#
-file(GLOB source_config
-  src/config/*.[hc]pp)
-add_library(config STATIC ${source_config})
-target_link_libraries(config utils)
+if(NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/louloulibs")
+  message(FATAL_ERROR "louloulibs/ directory not found. Make sure you fetched the submodules with 'git submodule init && git submodule update'")
+endif()
+add_subdirectory("louloulibs")
+include_directories("louloulibs")
 
-#
-## logger
-#
-file(GLOB source_logger
-  src/logger/*.[hc]pp)
-add_library(logger STATIC ${source_logger})
-target_link_libraries(logger config)
+include_directories(${EXPAT_INCLUDE_DIRS})
+include_directories(${ICONV_INCLUDE_DIRS})
+include_directories(${LIBUUID_INCLUDE_DIRS})
 
-#
-## network
-#
-file(GLOB source_network
-  src/network/*.[hc]pp)
-add_library(network STATIC ${source_network})
-target_link_libraries(network logger)
-if(BOTAN_FOUND)
-  target_link_libraries(network ${BOTAN_LIBRARIES})
-endif()
-if(CARES_FOUND)
-  target_link_libraries(network ${CARES_LIBRARIES})
-endif()
+# If they are found in louloulibs CMakeLists.txt, we inherite these values
+include_directories(${LIBIDN_INCLUDE_DIRS})
+include_directories(${SYSTEMD_INCLUDE_DIRS})
+include_directories(SYSTEM ${BOTAN_INCLUDE_DIRS})
+include_directories(${CARES_INCLUDE_DIRS})
 
 #
 ## irclib
@@ -168,17 +88,12 @@ add_library(irc STATIC ${source_irc})
 target_link_libraries(irc network utils logger)
 
 #
-## xmpplib
+## xmpp
 #
 file(GLOB source_xmpp
   src/xmpp/*.[hc]pp)
 add_library(xmpp STATIC ${source_xmpp})
-target_link_libraries(xmpp bridge network utils logger
-  ${EXPAT_LIBRARIES}
-  ${LIBUUID_LIBRARIES})
-if(LIBIDN_FOUND)
-  target_link_libraries(xmpp ${LIBIDN_LIBRARIES})
-endif()
+target_link_libraries(xmpp xmpplib bridge network utils logger)
 
 #
 ## bridge
@@ -209,6 +124,7 @@ endif()
 add_executable(test_suite EXCLUDE_FROM_ALL
   src/test.cpp)
 target_link_libraries(test_suite
+  xmpplib
   xmpp
   irc
   bridge
@@ -216,9 +132,6 @@ target_link_libraries(test_suite
   config
   logger)
 
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/config.h)
-
 #
 ## Install target
 #