[Pkg-voip-commits] [bctoolbox] 40/57: Fix build issue with CMake < 3.1

[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 10b40a5ee7892e739fb93e78aed1e49bff612a52
Author: François Grisez <francois.grisez at belledonne-communications.com>
Date:   Wed Feb 1 12:53:38 2017 +0100

    Fix build issue with CMake < 3.1
---
 CMakeLists.txt     | 6 +++++-
 src/CMakeLists.txt | 8 ++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b672d2f..ed7aa00 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -152,7 +152,11 @@ add_definitions("-DHAVE_CONFIG_H")
 
 set(STRICT_OPTIONS_CPP )
 set(STRICT_OPTIONS_C )
-set(STRICT_OPTIONS_CXX )
+if(CMAKE_VERSION VERSION_LESS 3.1 AND NOT APPLE AND NOT MSVC)
+	set(STRICT_OPTIONS_CXX "-std=c++11")
+else()
+	set(STRICT_OPTIONS_CXX )
+endif()
 if(MSVC)
 	if(ENABLE_STRICT)
 		list(APPEND STRICT_OPTIONS_CPP "/WX")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c611f17..5bee5f8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -62,7 +62,9 @@ if(ENABLE_STATIC)
 		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)
+	if(NOT CMAKE_VERSION VERSION_LESS 3.1)
+		set_target_properties(bctoolbox-static PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON)
+	endif()
 	set_target_properties(bctoolbox-static PROPERTIES OUTPUT_NAME bctoolbox)
 	if(HAVE_LIBRT)
 		target_link_libraries(bctoolbox-static rt)
@@ -87,7 +89,9 @@ 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(NOT CMAKE_VERSION VERSION_LESS 3.1)
+		set_target_properties(bctoolbox PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON)
+	endif()
 	if(ANDROID)
 		set_target_properties(bctoolbox PROPERTIES OUTPUT_NAME "bctoolbox-${NDK_ARCHITECTURE}")
 	else()

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