Migrate libasyncio from boost.signal to signals2 (#8756)

[libasyncio] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4afafa0..08daf35 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Project
 project(libasyncio)
-set(VERSION 0.2)
+set(VERSION 0.3)
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")
 
 # CMake
@@ -15,28 +15,29 @@ set(CPACK_SOURCE_PACKAGE_FILE_NAME     "${PROJECT_NAME}-${VERSION}")
 # Find external packages
 include(FindPkgConfig)
 
-option(WITH_LIBI2NCOMMON OFF)
+option(WITH_LIBI2NCOMMON "Build with libi2ncommon support" OFF)
 if(WITH_LIBI2NCOMMON)
+    message(STATUS "[!] Building *with* libi2ncommon support. [!]")
     pkg_check_modules(LIBI2NCOMMON REQUIRED libi2ncommon)
     include_directories(${LIBI2NCOMMON_INCLUDE_DIRS})
     link_directories(${LIBI2NCOMMON_LIBRARY_DIRS})
-elseif(WITH_LIBI2NCOMMON)
+else(WITH_LIBI2NCOMMON)
     message(STATUS "[!] Building *without* libi2ncommon support. [!]")
 endif(WITH_LIBI2NCOMMON)
 
-find_package(Boost 1.34 REQUIRED COMPONENTS signals unit_test_framework)
+find_package(Boost 1.34 REQUIRED COMPONENTS unit_test_framework)
 include_directories(${Boost_INCLUDE_DIRS})
 
-option(WITH_LIBT2N OFF)
+option(WITH_LIBT2N "Build with libt2n support" OFF)
 if(WITH_LIBT2N)
+    message(STATUS "[!] Building *with* libt2n support. [!]")
     pkg_check_modules(LIBT2N REQUIRED libt2n)
     include_directories(${LIBT2N_INCLUDE_DIRS})
     link_directories(${LIBT2N_LIBRARY_DIRS})
-    # set(T2NDIRS glue_t2n)
-elseif(WITH_LIBT2N)
+    add_subdirectory(glue_t2n)
+else(WITH_LIBT2N)
     message(STATUS "[!] Building *without* libt2n support. [!]")
 endif(WITH_LIBT2N)
-set(T2NDIRS glue_t2n)
 
 # Documentation
 find_package(Doxygen)
@@ -45,6 +46,7 @@ if(DOXYGEN_FOUND)
    message(STATUS "Doxygen found.")
    set(DOXY_DIR "${CMAKE_SOURCE_DIR}/doc")
    set(DOXY_CONFIG "${DOXY_DIR}/Doxyfile.in")
+   set(top_srcdir ${CMAKE_SOURCE_DIR})
 
    # Copy doxy.config.in
    configure_file("${DOXY_CONFIG}" "${CMAKE_BINARY_DIR}/doxy.config")
@@ -81,9 +83,6 @@ include(CheckIncludeFiles)
 if(Boost_FOUND)
     set(HAVE_BOOST 1)
 endif()
-if(Boost_SIGNALS_FOUND)
-    set(HAVE_BOOST_SIGNALS 1)
-endif()
 if(Boost_UNIT_TEST_FRAMEWORK_FOUND)
     set(HAVE_BOOST_UNIT_TEST_FRAMEWORK 1)
 endif()
@@ -147,9 +146,6 @@ install(FILES ${CMAKE_BINARY_DIR}/glue_t2n/libasyncio_t2n.pc DESTINATION lib/pkg
 set(CPACK_SET_DESTDIR "ON")
 add_subdirectory(utils)
 add_subdirectory(asyncio)
-# if(${WITH_LIBT2N})
-add_subdirectory(${T2NDIRS})
-# endif(${WITH_LIBT2N})
 add_subdirectory(unittest)
 
 include(CPack)