[PATCH 01/12] Build Subsurface c++ as c++11 code

Anton Lundin glance at acc.umu.se
Thu Jun 23 13:56:26 PDT 2016


With Qt 5.7, they started to require c++11 support, and in 5.6.1 some
nullptr's showed up in QtAndroidExtras/qandroidfunctions.h, so now we
need to compile our c++ code with c++11 support in our compiler.

As Thiago pointed out, this effectively "downgrades" GCC 6 from c++14
support to c++11.

Signed-off-by: Anton Lundin <glance at acc.umu.se>
---
 CMakeLists.txt             | 3 +++
 packaging/android/build.sh | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc7db13..cb05b3a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,10 +69,13 @@ set(CMAKE_MODULE_PATH
 #
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 ")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 ")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
   # using Intel C++
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
diff --git a/packaging/android/build.sh b/packaging/android/build.sh
index 3b796b8..bd24f18 100644
--- a/packaging/android/build.sh
+++ b/packaging/android/build.sh
@@ -335,7 +335,6 @@ fi
 
 PKGCONF=$(which pkg-config)
 cmake $MOBILE_CMAKE \
-	-DCMAKE_CXX_FLAGS="-std=c++11" \
 	-DQT_ANDROID_ANT=${ANT} \
 	-DPKG_CONFIG_EXECUTABLE=${PKGCONF} \
 	-DQT_ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT \
-- 
2.7.4



More information about the subsurface mailing list