From c26e19ebff913ee11d40045ac3cf57dddd56c71c Mon Sep 17 00:00:00 2001
From: Gerd von Egidy <gerd.von.egidy@intra2net.com>
Date: Tue, 8 Sep 2015 18:54:53 +0200
Subject: [PATCH] Fix CMake conversion.

Nobody seems to have ever tested or used it before.
---
 CMakeLists.txt                 |   16 +++++++---------
 utils/CMakeLists.txt           |    1 +
 utils/i2ncommon/CMakeLists.txt |   18 ++++++++++--------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4afafa0..b5fa04d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
 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)
@@ -147,9 +148,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)
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 9b1a213..6490d2f 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -1,5 +1,6 @@
 # Sources
 add_subdirectory(i2ncommon)
+
 set(libasyncio_utils_SOURCES
     asyncio_time_tools.cpp
     asyncio_utils.cpp
diff --git a/utils/i2ncommon/CMakeLists.txt b/utils/i2ncommon/CMakeLists.txt
index 51292ac..450386a 100644
--- a/utils/i2ncommon/CMakeLists.txt
+++ b/utils/i2ncommon/CMakeLists.txt
@@ -1,11 +1,13 @@
 # Sources
-if(WITH_LIBI2NCOMMON)
+if(NOT WITH_LIBI2NCOMMON)
     set(compat_HEADERS
-	containerfunc.hpp
-	signalfunc.hpp
-	)
+        i2ncommon/containerfunc.hpp
+        i2ncommon/signalfunc.hpp
+        PARENT_SCOPE
+    )
     set(compat_SOURCES
-	containerfunc.cpp
-	signalfunc.cpp
-	)
-endif(WITH_LIBI2NCOMMON)
+        i2ncommon/containerfunc.cpp
+        i2ncommon/signalfunc.cpp
+        PARENT_SCOPE
+    )
+endif(NOT WITH_LIBI2NCOMMON)
-- 
1.7.1