[Pkg-voip-commits] [bctoolbox] 11/57: conditionnal compilation of exception.c

[daniel at gnoutcheff.name]

This is an automated email from the git hooks/post-receive script.

gnoutchd-guest pushed a commit to branch debian/sid
in repository bctoolbox.

commit 9768411c374230f4f17d058ed0bda6dd0d7c7996
Author: Jehan Monnier <jehan.monnier at linphone.org>
Date:   Fri Nov 18 17:19:44 2016 +0100

    conditionnal compilation of exception.c
---
 CMakeLists.txt         | 1 +
 include/CMakeLists.txt | 4 +++-
 src/CMakeLists.txt     | 5 +++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29b2f8b..4a86048 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -198,6 +198,7 @@ endif()
 
 check_library_exists("rt" "clock_gettime" "" HAVE_LIBRT)
 check_library_exists("dl" "dladdr" "" HAVE_LIBDL)
+check_include_file("execinfo.h" HAVE_EXECINFO)
 
 add_subdirectory(include)
 add_subdirectory(src)
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 79ff0e7..86f230d 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -27,11 +27,13 @@ set(HEADER_FILES
 	map.h
 	port.h
 	vfs.h
-	exception.hh
 )
 if(ENABLE_TESTS_COMPONENT)
 	list(APPEND HEADER_FILES tester.h)
 endif()
+if(HAVE_EXECINFO) 
+	list(APPEND HEADER_FILES exception.h)
+endif()
 
 set(BCTOOLBOX_HEADER_FILES )
 foreach(HEADER_FILE ${HEADER_FILES})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2a99bbf..9b571d3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -24,12 +24,13 @@ set(BCTOOLBOX_C_SOURCE_FILES
 	containers/list.c
 	logging/logging.c
 	utils/port.c
-	utils/exception.cc
 	vfs.c
 )
 
 set_source_files_properties(utils/exception.cc PROPERTIES COMPILE_FLAGS -std=c++11)
-
+if(HAVE_EXECINFO) 
+	set(BCTOOLBOX_CXX_SOURCE_FILES utils/exception.cc)
+endif()
 set(BCTOOLBOX_CXX_SOURCE_FILES containers/map.cc)
 
 if(MBEDTLS_FOUND)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/bctoolbox.git