diff options
| author | Marc Chevrier <marc.chevrier@gmail.com> | 2021-02-11 15:45:45 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-04-05 18:00:03 (GMT) |
| commit | 8c525d7e16f7613ffc2fb5eb15b78b799dcd5982 (patch) | |
| tree | dd4a89b6376178bf2457e45db242d4bc3d7f54f9 /Modules | |
| parent | 26af5908ec3be728b8ae487926b542be63e11af7 (diff) | |
| download | CMake-8c525d7e16f7613ffc2fb5eb15b78b799dcd5982.zip CMake-8c525d7e16f7613ffc2fb5eb15b78b799dcd5982.tar.gz CMake-8c525d7e16f7613ffc2fb5eb15b78b799dcd5982.tar.bz2 | |
UseSWIG: Run using policy settings from includer
Backport commit de7f0aa6c0 (UseSWIG: avoid spurious policy warnings,
2021-02-11) to the 3.20 release branch. Projects need to be able to
control policies.
Issue: #22029
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/UseSWIG.cmake | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake index 7d7f737..b1e0576 100644 --- a/Modules/UseSWIG.cmake +++ b/Modules/UseSWIG.cmake @@ -338,20 +338,11 @@ as well as ``SWIG``: initialized with the value of this variable. #]=======================================================================] -cmake_policy(GET CMP0078 target_name_policy) -cmake_policy(GET CMP0086 module_name_policy) - -cmake_policy (VERSION 3.12) -if (target_name_policy) - # respect user choice regarding CMP0078 policy - cmake_policy(SET CMP0078 ${target_name_policy}) -endif() -if (module_name_policy) - # respect user choice regarding CMP0086 policy - cmake_policy(SET CMP0086 ${module_name_policy}) -endif() -unset(target_name_policy) -unset(module_name_policy) +cmake_policy(PUSH) +# numbers and boolean constants +cmake_policy (SET CMP0012 NEW) +# IN_LIST operator +cmake_policy (SET CMP0057 NEW) set(SWIG_CXX_EXTENSION "cxx") set(SWIG_EXTRA_LIBRARIES "") @@ -911,7 +902,7 @@ function(SWIG_ADD_LIBRARY name) if (APPLE) set_target_properties (${target_name} PROPERTIES SUFFIX ".jnilib") endif() - if ((WIN32 AND MINGW) OR CYGWIN OR CMAKE_SYSTEM_NAME STREQUAL MSYS) + if ((WIN32 AND MINGW) OR CYGWIN OR CMAKE_SYSTEM_NAME STREQUAL "MSYS") set_target_properties(${target_name} PROPERTIES PREFIX "") endif() elseif (swig_lowercase_language STREQUAL "lua") @@ -1007,3 +998,5 @@ function(SWIG_LINK_LIBRARIES name) endif() endif() endfunction() + +cmake_policy(POP) |