diff options
| author | David Redondo <kde@david-redondo.de> | 2019-11-30 11:23:39 +0100 |
|---|---|---|
| committer | David Redondo <kde@david-redondo.de> | 2019-11-30 15:08:44 +0100 |
| commit | bfdcec82d926416ac2eb3657b903414b52f72e31 (patch) | |
| tree | 5255a348213b8c3d490311d91d8034035d70804b /tests | |
| parent | be2beb96a3b82db382e2d9fcaa15c42769c5f8fb (diff) | |
| download | extra-cmake-modules-bfdcec82d926416ac2eb3657b903414b52f72e31.tar.gz extra-cmake-modules-bfdcec82d926416ac2eb3657b903414b52f72e31.tar.bz2 | |
Fix EcmGenerateExportHeader tests on Windows
Summary: -weXXXX errors on warning XXXX. C4996 warns on deprecated declarations.
Test Plan: Tests pass.
Reviewers: kossebau, #windows, #frameworks
Reviewed By: kossebau
Subscribers: kde-frameworks-devel, kde-buildsystem
Tags: #frameworks, #build_system
Differential Revision: https://phabricator.kde.org/D25626
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ECMGenerateExportHeaderTest/consumer/testAPI_DISABLE_DEPRECATED_BEFORE_AND_AT.cmake | 8 | ||||
| -rw-r--r-- | tests/ECMGenerateExportHeaderTest/consumer/testAPI_NO_DEPRECATED.cmake | 7 |
2 files changed, 13 insertions, 2 deletions
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 fac51d53..70065cdf 100644 --- a/tests/ECMGenerateExportHeaderTest/consumer/testAPI_DISABLE_DEPRECATED_BEFORE_AND_AT.cmake +++ b/tests/ECMGenerateExportHeaderTest/consumer/testAPI_DISABLE_DEPRECATED_BEFORE_AND_AT.cmake @@ -62,7 +62,13 @@ int main(int, char**) set(_dep_warning_result_expected TRUE) endif() - set(CMAKE_REQUIRED_FLAGS "-Werror=deprecated-declarations") + if(MSVC) + # warning C4996 warns about deprecated declarations + set(CMAKE_REQUIRED_FLAGS "-we4996") + else() + set(CMAKE_REQUIRED_FLAGS "-Werror=deprecated-declarations") + endif() + set(CMAKE_REQUIRED_DEFINITIONS) # unset LIBRARY_DISABLE_DEPRECATED_BEFORE_AND_AT, as LIBRARY_DEPRECATED_WARNINGS_SINCE defaults to it unset(_dep_warning_result CACHE) # clear out as check_cxx_source_compiles caches the result check_cxx_source_compiles("${_code}" _dep_warning_result) diff --git a/tests/ECMGenerateExportHeaderTest/consumer/testAPI_NO_DEPRECATED.cmake b/tests/ECMGenerateExportHeaderTest/consumer/testAPI_NO_DEPRECATED.cmake index 190ccecc..fa6a63ec 100644 --- a/tests/ECMGenerateExportHeaderTest/consumer/testAPI_NO_DEPRECATED.cmake +++ b/tests/ECMGenerateExportHeaderTest/consumer/testAPI_NO_DEPRECATED.cmake @@ -41,7 +41,12 @@ int main(int, char**) set(_dep_warning_result_expected TRUE) endif() - set(CMAKE_REQUIRED_FLAGS "-Werror=deprecated-declarations") + if(MSVC) + # warning C4996 warns about deprecated declarations + set(CMAKE_REQUIRED_FLAGS "-we4996") + else() + set(CMAKE_REQUIRED_FLAGS "-Werror=deprecated-declarations") + endif() set(CMAKE_REQUIRED_DEFINITIONS) # unset LIBRARY_DISABLE_DEPRECATED_BEFORE_AND_AT, as LIBRARY_DEPRECATED_WARNINGS_SINCE defaults to it unset(_dep_warning_result CACHE) # clear out as check_cxx_source_compiles caches the result check_cxx_source_compiles("${_code}" _dep_warning_result) |