diff options
| author | Brad King <brad.king@kitware.com> | 2018-07-27 14:08:47 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-07-27 14:08:54 (GMT) |
| commit | 5bbcf76399e107bbb1712ba8aeee27c160413d2d (patch) | |
| tree | 011dc8351cd5581897a28bed1c5b3ee271991a60 /Tests/UseSWIG | |
| parent | bccbf9a737785c34e0b23b2b456fbb4e112d42fb (diff) | |
| parent | a3a0c3aa71498f76cc0e9655038de7bbb5430a03 (diff) | |
| download | CMake-5bbcf76399e107bbb1712ba8aeee27c160413d2d.zip CMake-5bbcf76399e107bbb1712ba8aeee27c160413d2d.tar.gz CMake-5bbcf76399e107bbb1712ba8aeee27c160413d2d.tar.bz2 | |
Merge topic 'UseSWIG-target-name-policy'
a3a0c3aa71 UseSWIG: add policy to manage target naming strategy.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2232
Diffstat (limited to 'Tests/UseSWIG')
| -rw-r--r-- | Tests/UseSWIG/BasicConfiguration.cmake | 1 | ||||
| -rw-r--r-- | Tests/UseSWIG/BasicCsharp/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/UseSWIG/BasicPerl/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/UseSWIG/BasicPython/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/UseSWIG/ModuleVersion2/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/UseSWIG/MultipleModules/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/UseSWIG/MultiplePython/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/UseSWIG/UseTargetINCLUDE_DIRECTORIES/CMakeLists.txt | 3 |
8 files changed, 7 insertions, 12 deletions
diff --git a/Tests/UseSWIG/BasicConfiguration.cmake b/Tests/UseSWIG/BasicConfiguration.cmake index ad34d39..fd3ac40 100644 --- a/Tests/UseSWIG/BasicConfiguration.cmake +++ b/Tests/UseSWIG/BasicConfiguration.cmake @@ -58,7 +58,6 @@ if(${language} MATCHES lua) set(SWIG_LANG_LIBRARIES ${LUA_LIBRARIES}) endif() -set(UseSWIG_TARGET_NAME_PREFERENCE STANDARD) unset(CMAKE_SWIG_FLAGS) set (CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/Tests/UseSWIG/BasicCsharp/CMakeLists.txt b/Tests/UseSWIG/BasicCsharp/CMakeLists.txt index 84743ef..1a6c763 100644 --- a/Tests/UseSWIG/BasicCsharp/CMakeLists.txt +++ b/Tests/UseSWIG/BasicCsharp/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.12) +cmake_minimum_required(VERSION 3.12...3.13) project(TestBasicCsharp CXX CSharp) diff --git a/Tests/UseSWIG/BasicPerl/CMakeLists.txt b/Tests/UseSWIG/BasicPerl/CMakeLists.txt index 476ef0e..cf02de7 100644 --- a/Tests/UseSWIG/BasicPerl/CMakeLists.txt +++ b/Tests/UseSWIG/BasicPerl/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.1...3.13) project(TestBasicPerl CXX) diff --git a/Tests/UseSWIG/BasicPython/CMakeLists.txt b/Tests/UseSWIG/BasicPython/CMakeLists.txt index cf1d821..8bbd1cb 100644 --- a/Tests/UseSWIG/BasicPython/CMakeLists.txt +++ b/Tests/UseSWIG/BasicPython/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.1...3.13) project(TestBasicPython CXX) diff --git a/Tests/UseSWIG/ModuleVersion2/CMakeLists.txt b/Tests/UseSWIG/ModuleVersion2/CMakeLists.txt index 452f9e2..a7ee210 100644 --- a/Tests/UseSWIG/ModuleVersion2/CMakeLists.txt +++ b/Tests/UseSWIG/ModuleVersion2/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.1...3.13) project(TestModuleVersion2 CXX) @@ -16,7 +16,6 @@ else() set (PS ":") endif() -set(UseSWIG_TARGET_NAME_PREFERENCE STANDARD) set (UseSWIG_MODULE_VERSION 2) unset(CMAKE_SWIG_FLAGS) diff --git a/Tests/UseSWIG/MultipleModules/CMakeLists.txt b/Tests/UseSWIG/MultipleModules/CMakeLists.txt index 25dd6b3..f1dc379 100644 --- a/Tests/UseSWIG/MultipleModules/CMakeLists.txt +++ b/Tests/UseSWIG/MultipleModules/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.1...3.13) project(TestMultipleModules CXX) @@ -19,7 +19,6 @@ else() set (PS ":") endif() -set(UseSWIG_TARGET_NAME_PREFERENCE STANDARD) unset(CMAKE_SWIG_FLAGS) set_property(SOURCE "../example.i" PROPERTY CPLUSPLUS ON) diff --git a/Tests/UseSWIG/MultiplePython/CMakeLists.txt b/Tests/UseSWIG/MultiplePython/CMakeLists.txt index a1651fb..8f87755 100644 --- a/Tests/UseSWIG/MultiplePython/CMakeLists.txt +++ b/Tests/UseSWIG/MultiplePython/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.1...3.13) project(TestMultiplePython CXX) @@ -17,7 +17,6 @@ else() set (PS ":") endif() -set(UseSWIG_TARGET_NAME_PREFERENCE STANDARD) unset(CMAKE_SWIG_FLAGS) set_property(SOURCE "../example.i" PROPERTY CPLUSPLUS ON) diff --git a/Tests/UseSWIG/UseTargetINCLUDE_DIRECTORIES/CMakeLists.txt b/Tests/UseSWIG/UseTargetINCLUDE_DIRECTORIES/CMakeLists.txt index d0855bf..fbb72d5 100644 --- a/Tests/UseSWIG/UseTargetINCLUDE_DIRECTORIES/CMakeLists.txt +++ b/Tests/UseSWIG/UseTargetINCLUDE_DIRECTORIES/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.1...3.13) project(TestUseTargetINCLUDE_DIRECTORIES CXX) @@ -9,7 +9,6 @@ include(${SWIG_USE_FILE}) find_package(Python3 REQUIRED COMPONENTS Interpreter Development) -set(UseSWIG_TARGET_NAME_PREFERENCE STANDARD) unset(CMAKE_SWIG_FLAGS) set_property(SOURCE "example.i" PROPERTY CPLUSPLUS ON) |