diff options
author | Brad King <brad.king@kitware.com> | 2022-04-26 12:41:16 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2022-04-26 16:01:06 (GMT) |
commit | 61bea8f3c88581f4e0c8723fc88161795c54f092 (patch) | |
tree | b739e372a722fdab9526f2879306886516770ef7 /Tests | |
parent | 02ec5c4ad2008ce78b80d70afea1217f65d8112c (diff) | |
download | CMake-61bea8f3c88581f4e0c8723fc88161795c54f092.zip CMake-61bea8f3c88581f4e0c8723fc88161795c54f092.tar.gz CMake-61bea8f3c88581f4e0c8723fc88161795c54f092.tar.bz2 |
Tests: Remove incidental use of C++98 compiler modes
Several tests specify use of C++98 mode since commit b0f277db38 (HP aCC:
record compiler flag for Ansi C++98 support for version 3.80 onwards,
2014-04-15, v3.1.0-rc1~550^2). The motivating use case for those
changes was dropped by commit 49640d3629 (HP-UX: Drop support for
building CMake on HP-UX, 2017-08-04, v3.10.0-rc1~304^2), so remove the
use of C++98 mode too. Also remove code that, on some compilers, used
C++11 instead of C++98, because we can now just use their default mode.
Diffstat (limited to 'Tests')
-rw-r--r-- | Tests/AliasTarget/CMakeLists.txt | 8 | ||||
-rw-r--r-- | Tests/Complex/CMakeLists.txt | 15 | ||||
-rw-r--r-- | Tests/ComplexOneConfig/CMakeLists.txt | 15 | ||||
-rw-r--r-- | Tests/Plugin/CMakeLists.txt | 9 | ||||
-rw-r--r-- | Tests/RunCMake/GenerateExportHeader/GEH.cmake | 8 |
5 files changed, 0 insertions, 55 deletions
diff --git a/Tests/AliasTarget/CMakeLists.txt b/Tests/AliasTarget/CMakeLists.txt index fc70135..aa4abc4 100644 --- a/Tests/AliasTarget/CMakeLists.txt +++ b/Tests/AliasTarget/CMakeLists.txt @@ -2,14 +2,6 @@ cmake_minimum_required(VERSION 2.8.11) cmake_policy(SET CMP0054 NEW) project(AliasTarget) -set(CMAKE_CXX_STANDARD 98) - -# Clang/C2 in C++98 mode cannot properly handle some of MSVC headers -if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND - CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC") - set(CMAKE_CXX_STANDARD 11) -endif() - add_library(foo SHARED empty.cpp) add_library(PREFIX::Foo ALIAS foo) add_library(Another::Alias ALIAS foo) diff --git a/Tests/Complex/CMakeLists.txt b/Tests/Complex/CMakeLists.txt index 9fd85be..5df22d2 100644 --- a/Tests/Complex/CMakeLists.txt +++ b/Tests/Complex/CMakeLists.txt @@ -432,21 +432,6 @@ if(NOT RESULT STREQUAL "a[b]c[d]e") endif() # -# This tests needs Ansi C++98 -# -set(CMAKE_CXX_STANDARD 98) -# -# GNU extensions are needed for stricmp() on Windows. -# -set(CMAKE_CXX_EXTENSIONS TRUE) - -# Clang/C2 in C++98 mode cannot properly handle some of MSVC headers -if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND - CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC") - set(CMAKE_CXX_STANDARD 11) -endif() - -# # Create the libs and the main exe # add_subdirectory(Library) diff --git a/Tests/ComplexOneConfig/CMakeLists.txt b/Tests/ComplexOneConfig/CMakeLists.txt index 28b73af..5a4134d 100644 --- a/Tests/ComplexOneConfig/CMakeLists.txt +++ b/Tests/ComplexOneConfig/CMakeLists.txt @@ -389,21 +389,6 @@ if(NOT RESULT STREQUAL "a[b]c[d]e") endif() # -# This tests needs Ansi C++98 -# -set(CMAKE_CXX_STANDARD 98) -# -# GNU extensions are needed for stricmp() on Windows. -# -set(CMAKE_CXX_EXTENSIONS TRUE) - -# Clang/C2 in C++98 mode cannot properly handle some of MSVC headers -if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND - CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC") - set(CMAKE_CXX_STANDARD 11) -endif() - -# # Create the libs and the main exe # add_subdirectory(Library) diff --git a/Tests/Plugin/CMakeLists.txt b/Tests/Plugin/CMakeLists.txt index ec22bf4..c2f43cd 100644 --- a/Tests/Plugin/CMakeLists.txt +++ b/Tests/Plugin/CMakeLists.txt @@ -2,9 +2,6 @@ cmake_minimum_required (VERSION 2.8.12) cmake_policy(SET CMP0054 NEW) project(Plugin) -# We need proper C++98 support from the compiler -set(CMAKE_CXX_STANDARD 98) - # Test per-target output directory properties. set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${Plugin_BINARY_DIR}/bin) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${Plugin_BINARY_DIR}/lib/plugin) @@ -21,12 +18,6 @@ include_directories( ${Plugin_SOURCE_DIR}/include ) -# Clang/C2 in C++98 mode cannot properly handle some of MSVC headers -if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND - CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC") - set(CMAKE_CXX_STANDARD 11) -endif() - # Create an executable that exports an API for use by plugins. add_executable(example_exe src/example_exe.cxx src/DynamicLoader.cxx) set_target_properties(example_exe PROPERTIES diff --git a/Tests/RunCMake/GenerateExportHeader/GEH.cmake b/Tests/RunCMake/GenerateExportHeader/GEH.cmake index 431d1ce..bf9c302 100644 --- a/Tests/RunCMake/GenerateExportHeader/GEH.cmake +++ b/Tests/RunCMake/GenerateExportHeader/GEH.cmake @@ -43,14 +43,6 @@ endif() include(GenerateExportHeader) -set(CMAKE_CXX_STANDARD 98) - -# Clang/C2 in C++98 mode cannot properly handle some of MSVC headers -if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND - CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC") - set(CMAKE_CXX_STANDARD 11) -endif() - add_subdirectory(lib_shared_and_static) if(CMAKE_SYSTEM_NAME MATCHES "AIX" AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU" |