diff options
| author | Brad King <brad.king@kitware.com> | 2019-08-29 17:07:11 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-08-29 17:07:11 (GMT) |
| commit | 6a9de634b2973f9ee51333fb75c22d994d3b0de8 (patch) | |
| tree | f516905a4aadfec784d35d9d6a52815432fd3c8a /Source/kwsys/CMakeLists.txt | |
| parent | 3ec986ce8e8df269eb6b6b9f37e12b02194168fd (diff) | |
| parent | f9a3f13415bb6d6f1750cfe5a45ce4aa9e329907 (diff) | |
| download | CMake-6a9de634b2973f9ee51333fb75c22d994d3b0de8.zip CMake-6a9de634b2973f9ee51333fb75c22d994d3b0de8.tar.gz CMake-6a9de634b2973f9ee51333fb75c22d994d3b0de8.tar.bz2 | |
Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
KWSys 2019-08-29 (08f14d96)
Diffstat (limited to 'Source/kwsys/CMakeLists.txt')
| -rw-r--r-- | Source/kwsys/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/kwsys/CMakeLists.txt b/Source/kwsys/CMakeLists.txt index 79e813e..09bcdb9 100644 --- a/Source/kwsys/CMakeLists.txt +++ b/Source/kwsys/CMakeLists.txt @@ -121,8 +121,8 @@ if(KWSYS_CXX_STANDARD) set(CMAKE_CXX_STANDARD "${KWSYS_CXX_STANDARD}") elseif(NOT DEFINED CMAKE_CXX_STANDARD AND NOT DEFINED KWSYS_CXX_STANDARD) if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" - AND "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC" - AND "x${CMAKE_CXX_COMPILER_FRONTEND_VARIANT}" STREQUAL "xGNU" + AND CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC" + AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "GNU" ) set(CMAKE_CXX_STANDARD 14) else() @@ -1013,7 +1013,7 @@ ADD_DEFINITIONS("-DKWSYS_NAMESPACE=${KWSYS_NAMESPACE}") # Disable deprecation warnings for standard C functions. IF(MSVC OR (WIN32 AND (CMAKE_C_COMPILER_ID STREQUAL "Intel" OR - (CMAKE_C_COMPILER_ID STREQUAL "Clang" AND "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")))) + (CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC")))) ADD_DEFINITIONS( -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_DEPRECATE @@ -1104,7 +1104,7 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR) SET(KWSYS_CXX_TESTS ${KWSYS_CXX_TESTS} testConsoleBuf.cxx ) - IF("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC" AND + IF(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "19.0.23506") set_property(SOURCE testConsoleBuf.cxx testConsoleBufChild.cxx PROPERTY COMPILE_FLAGS /utf-8) ENDIF() |