diff options
| author | Friedrich W. H. Kossebau <kossebau@kde.org> | 2021-04-28 00:30:08 +0200 |
|---|---|---|
| committer | Friedrich W. H. Kossebau <kossebau@kde.org> | 2021-04-28 00:30:08 +0200 |
| commit | 77e9318d5245c6782e4381699d6f485876e8e9cd (patch) | |
| tree | 4440aa0361b4b06b512ab518e198bcdfc8397af5 | |
| parent | dd91c16cbd6d73e065e7d42923c8cc23fa3ef01a (diff) | |
| download | extra-cmake-modules-5.82.0-rc1.tar.gz extra-cmake-modules-5.82.0-rc1.tar.bz2 | |
ECMGenerateExportHeaderTest: try to fix tests for MSVCv5.82.0-rc1v5.82.0
NO_CHANGELOG
3 files changed, 14 insertions, 3 deletions
diff --git a/tests/ECMGenerateExportHeaderTest/consumer/CMakeLists.txt b/tests/ECMGenerateExportHeaderTest/consumer/CMakeLists.txt index d071fcfb..fbbb5e7b 100644 --- a/tests/ECMGenerateExportHeaderTest/consumer/CMakeLists.txt +++ b/tests/ECMGenerateExportHeaderTest/consumer/CMakeLists.txt @@ -38,7 +38,12 @@ set(_code "Enum enumerator = Enumerator_deprecatedAt2_12;") testAPI(_code DEPRECATED_AT 2.12 CXX_STANDARD 11 NO_WARNING) set(_code "Enum enumerator = Enumerator_deprecatedAt2_12;") -testAPI(_code DEPRECATED_AT 2.12 CXX_STANDARD 17) +# we do not yet support enumerator warnings with MSVC +if(MSVC) + testAPI(_code DEPRECATED_AT 2.12 CXX_STANDARD 17 NO_WARNING) +else() + testAPI(_code DEPRECATED_AT 2.12 CXX_STANDARD 17) +endif() set(_code "Enum enumerator = Enumerator_not_deprecated;") testAPI(_code) diff --git a/tests/ECMGenerateExportHeaderTest/consumer/testAPI_DISABLE_DEPRECATED_BEFORE_AND_AT.cmake b/tests/ECMGenerateExportHeaderTest/consumer/testAPI_DISABLE_DEPRECATED_BEFORE_AND_AT.cmake index df7716a1..48f8a52e 100644 --- a/tests/ECMGenerateExportHeaderTest/consumer/testAPI_DISABLE_DEPRECATED_BEFORE_AND_AT.cmake +++ b/tests/ECMGenerateExportHeaderTest/consumer/testAPI_DISABLE_DEPRECATED_BEFORE_AND_AT.cmake @@ -38,7 +38,10 @@ function(testAPI code_var_name) if (ARGS_CXX_STANDARD) if(MSVC) - set(std_flag "/std:c++${ARGS_CXX_STANDARD}") + # C++11 is default for MSVC, no /std:c++11 flag available to set + if (NOT ARGS_CXX_STANDARD STREQUAL "11") + set(std_flag "/std:c++${ARGS_CXX_STANDARD}") + endif() else() set(std_flag "-std=c++${ARGS_CXX_STANDARD}") endif() diff --git a/tests/ECMGenerateExportHeaderTest/consumer/testAPI_NO_DEPRECATED.cmake b/tests/ECMGenerateExportHeaderTest/consumer/testAPI_NO_DEPRECATED.cmake index b01dfc3d..c326f8a0 100644 --- a/tests/ECMGenerateExportHeaderTest/consumer/testAPI_NO_DEPRECATED.cmake +++ b/tests/ECMGenerateExportHeaderTest/consumer/testAPI_NO_DEPRECATED.cmake @@ -19,7 +19,10 @@ function(testAPI code_var_name) if (ARGS_CXX_STANDARD) if(MSVC) - set(std_flag "/std:c++${ARGS_CXX_STANDARD}") + # C++11 is default for MSVC, no /std:c++11 flag available to set + if (NOT ARGS_CXX_STANDARD STREQUAL "11") + set(std_flag "/std:c++${ARGS_CXX_STANDARD}") + endif() else() set(std_flag "-std=c++${ARGS_CXX_STANDARD}") endif() |