[Pkg-voip-commits] [bctoolbox] 21/57: Improve definition of C++11 flags.

[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 d0ae2272566ff578f78954075376017dc3aa6478
Author: Ghislain MARY <ghislain.mary at belledonne-communications.com>
Date:   Mon Dec 19 14:29:38 2016 +0100

    Improve definition of C++11 flags.
---
 src/CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 350e16f..2f51ee5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -27,7 +27,6 @@ set(BCTOOLBOX_C_SOURCE_FILES
 	vfs.c
 )
 
-set_source_files_properties(utils/exception.cc PROPERTIES COMPILE_FLAGS -std=c++11)
 set(BCTOOLBOX_CXX_SOURCE_FILES containers/map.cc)
 
 if(HAVE_EXECINFO) 
@@ -61,6 +60,8 @@ if(ENABLE_STATIC)
 	if(WIN32)
 		target_compile_definitions(bctoolbox-static PUBLIC "-DBCTBX_STATIC")
 	endif()
+	set_target_properties(bctoolbox-static PROPERTIES LINKER_LANGUAGE "CXX")
+	set_target_properties(bctoolbox-static PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON)
 	set_target_properties(bctoolbox-static PROPERTIES OUTPUT_NAME bctoolbox)
 	if(HAVE_LIBRT)
 		target_link_libraries(bctoolbox-static rt)
@@ -85,6 +86,7 @@ if(ENABLE_SHARED)
 		target_compile_definitions(bctoolbox PRIVATE "-DBCTBX_EXPORTS")
 	endif()
 	set_target_properties(bctoolbox PROPERTIES LINKER_LANGUAGE "CXX")
+	set_target_properties(bctoolbox PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON)
 	if(ANDROID)
 		set_target_properties(bctoolbox PROPERTIES OUTPUT_NAME "bctoolbox-${CMAKE_SYSTEM_PROCESSOR}")
 	else()

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