From bfdcec82d926416ac2eb3657b903414b52f72e31 Mon Sep 17 00:00:00 2001 From: David Redondo Date: Sat, 30 Nov 2019 11:23:39 +0100 Subject: 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 --- .../consumer/testAPI_DISABLE_DEPRECATED_BEFORE_AND_AT.cmake | 8 +++++++- .../consumer/testAPI_NO_DEPRECATED.cmake | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'tests') 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) -- cgit v1.2.1