Skip to content

Commit c6b9821

Browse files
committed
Update modules for compatibility with CMake 3.12
1 parent 8911e42 commit c6b9821

File tree

2 files changed

+31
-6
lines changed

2 files changed

+31
-6
lines changed

CMakeLists.txt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,16 @@ if (FLIBCPP_USE_SWIG)
8888
"and reconfigure.")
8989
endif()
9090

91-
cmake_policy(SET CMP0078 "NEW")
92-
cmake_policy(SET CMP0086 "NEW")
91+
if (CMAKE_VERSION GREATER_EQUAL 3.13)
92+
cmake_policy(SET CMP0078 "NEW")
93+
else()
94+
set(FLIBCPP_CMP0078 "NEW")
95+
endif()
96+
if (CMAKE_VERSION GREATER_EQUAL 3.14)
97+
cmake_policy(SET CMP0086 "NEW")
98+
else()
99+
set(FLIBCPP_CMP0086 "NEW")
100+
endif()
93101
include(UseSWIG)
94102
endif()
95103

cmake/backport-cmake-318/UseSWIG.cmake

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -234,8 +234,12 @@ as well as ``SWIG``:
234234
set(SWIG_SOURCE_FILE_EXTENSIONS ".i" ".swg")
235235
#]=======================================================================]
236236

237-
cmake_policy(GET CMP0078 target_name_policy)
238-
cmake_policy(GET CMP0086 module_name_policy)
237+
if (CMAKE_VERSION GREATER_EQUAL 3.13)
238+
cmake_policy(GET CMP0078 target_name_policy)
239+
endif()
240+
if (CMAKE_VERSION GREATER_EQUAL 3.14)
241+
cmake_policy(GET CMP0086 module_name_policy)
242+
endif()
239243

240244
cmake_policy (VERSION 3.12)
241245
if (target_name_policy)
@@ -466,7 +470,14 @@ function(SWIG_ADD_SOURCE_TO_MODULE name outfiles infile)
466470
list (APPEND swig_special_flags "-c++")
467471
endif()
468472

469-
cmake_policy(GET CMP0086 module_name_policy)
473+
474+
if (CMAKE_VERSION GREATER_EQUAL 3.14)
475+
cmake_policy(GET CMP0086 module_name_policy)
476+
elseif(FLIBCPP_CMP0086)
477+
set(module_name_policy ${FLIBCPP_CMP0086})
478+
else()
479+
set(module_name_policy OLD)
480+
endif()
470481
if (module_name_policy STREQUAL "NEW")
471482
get_source_file_property(module_name "${infile}" SWIG_MODULE_NAME)
472483
if (module_name)
@@ -616,7 +627,13 @@ function(SWIG_ADD_LIBRARY name)
616627
unset(_SAM_TYPE)
617628
endif()
618629

619-
cmake_policy(GET CMP0078 target_name_policy)
630+
if (CMAKE_VERSION GREATER_EQUAL 3.13)
631+
cmake_policy(GET CMP0078 target_name_policy)
632+
elseif(FLIBCPP_CMP0078)
633+
set(target_name_policy ${FLIBCPP_CMP0078})
634+
else()
635+
set(target_name_policy OLD)
636+
endif()
620637
if (target_name_policy STREQUAL "NEW")
621638
set (UseSWIG_TARGET_NAME_PREFERENCE STANDARD)
622639
else()

0 commit comments

Comments
 (0)