diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | packaging/android/build.sh | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cc7db1329..cb05b3af9 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 3b796b826..bd24f18de 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 \ |