summaryrefslogtreecommitdiffstats
path: root/Tests/RunCMake
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-07-25 11:17:11 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-07-25 11:17:22 (GMT)
commit6e0d92cc53fae3f83cacc8c528ea601562fa1753 (patch)
treedcbfd35a22d7b2716fe30107ea609185ce149b7a /Tests/RunCMake
parent00be1957da52acac2988e4702f4f8e95fbf170dd (diff)
parenta4657ef670962be794d07d1d323c230995ed5593 (diff)
downloadCMake-6e0d92cc53fae3f83cacc8c528ea601562fa1753.zip
CMake-6e0d92cc53fae3f83cacc8c528ea601562fa1753.tar.gz
CMake-6e0d92cc53fae3f83cacc8c528ea601562fa1753.tar.bz2
Merge topic 'clang-gnulike-support'
a4657ef670 Merge branch 'backport-clang-gnulike-support' into clang-gnulike-support 161b33f12b Help/guide/tutorial: Revert "require C++14 for the Tutorial" 4f15a6a5c2 Tests: Revert "require C++14 for the Tutorial" 5cfc39127e Merge branch 'backport-clang-gnulike-support' into clang-gnulike-support d50b31be35 Clang: For MSVC ABI do not use modes older than C++14 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3592
Diffstat (limited to 'Tests/RunCMake')
-rw-r--r--Tests/RunCMake/GenerateExportHeader/GEH.cmake5
1 files changed, 0 insertions, 5 deletions
diff --git a/Tests/RunCMake/GenerateExportHeader/GEH.cmake b/Tests/RunCMake/GenerateExportHeader/GEH.cmake
index b3f1c7f..ae9a84c 100644
--- a/Tests/RunCMake/GenerateExportHeader/GEH.cmake
+++ b/Tests/RunCMake/GenerateExportHeader/GEH.cmake
@@ -51,11 +51,6 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND
set(CMAKE_CXX_STANDARD 11)
endif()
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND
- CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "GNU")
- set(CMAKE_CXX_STANDARD 14)
-endif()
-
add_subdirectory(lib_shared_and_static)
if(CMAKE_SYSTEM_NAME MATCHES "AIX" AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU"