This is an automated email from the ASF dual-hosted git repository.
jking pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git
commit 3cf066708e29e8cef76102c82cb51e74dfdd0426
Author: root <root@DESKTOP-12Q6GPI.localdomain>
AuthorDate: Sat Jan 5 10:03:19 2019 +0800
force c++11 in cmake
---
build/cmake/DefinePlatformSpecifc.cmake | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/build/cmake/DefinePlatformSpecifc.cmake
b/build/cmake/DefinePlatformSpecifc.cmake
index a809c07..e324f59 100644
--- a/build/cmake/DefinePlatformSpecifc.cmake
+++ b/build/cmake/DefinePlatformSpecifc.cmake
@@ -97,21 +97,14 @@ elseif(WITH_STDTHREADS)
endif()
# C++ Language Level
-set(CXX_LANGUAGE_LEVEL "C++${CMAKE_CXX_STANDARD}")
-if (CMAKE_CXX_STANDARD_REQUIRED)
- string(CONCAT CXX_LANGUAGE_LEVEL "${CXX_LANGUAGE_LEVEL} [compiler must
support it]")
-else()
- string(CONCAT CXX_LANGUAGE_LEVEL "${CXX_LANGUAGE_LEVEL} [fallback to earlier
if compiler does not support it]")
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+if ((CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES
"Clang") AND NOT MINGW)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-variadic-macros -Wno-long-long")
endif()
-if (CMAKE_CXX_EXTENSIONS)
- string(CONCAT CXX_LANGUAGE_LEVEL "${CXX_LANGUAGE_LEVEL} [with
compiler-specific extensions]")
-else()
- if ((CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES
"Clang") AND NOT MINGW)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-variadic-macros
-Wno-long-long")
- endif()
- if ((CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND NOT MINGW)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++11-long-long")
- endif()
+if ((CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND NOT MINGW)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++11-long-long")
endif()
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
