diff options
| author | Brad King <brad.king@kitware.com> | 2018-07-05 15:39:02 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-07-05 15:39:09 (GMT) |
| commit | 7f9652773a386ea6bf7eec66f2c58174ebe1b5d4 (patch) | |
| tree | 17610ed16829264f1e1ce5930d2f22475921e134 /Tests | |
| parent | 5c60e80c46fff4c3f8a5cbe8a60eb7dabaae566b (diff) | |
| parent | 8f2b483c0642589bec51a4caf26cd8c7fa75dd32 (diff) | |
| download | CMake-7f9652773a386ea6bf7eec66f2c58174ebe1b5d4.zip CMake-7f9652773a386ea6bf7eec66f2c58174ebe1b5d4.tar.gz CMake-7f9652773a386ea6bf7eec66f2c58174ebe1b5d4.tar.bz2 | |
Merge topic 'UseSWIG-legacy-targets'
8f2b483c06 Merge branch 'backport-UseSWIG-legacy-targets' into UseSWIG-legacy-targets
38ffcedd26 UseSWIG: reintroduce legacy target name management
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2188
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/UseSWIG/BasicConfiguration.cmake | 1 | ||||
| -rw-r--r-- | Tests/UseSWIG/ModuleVersion2/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Tests/UseSWIG/MultipleModules/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Tests/UseSWIG/MultiplePython/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Tests/UseSWIG/UseTargetINCLUDE_DIRECTORIES/CMakeLists.txt | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/Tests/UseSWIG/BasicConfiguration.cmake b/Tests/UseSWIG/BasicConfiguration.cmake index fd3ac40..ad34d39 100644 --- a/Tests/UseSWIG/BasicConfiguration.cmake +++ b/Tests/UseSWIG/BasicConfiguration.cmake @@ -58,6 +58,7 @@ 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/ModuleVersion2/CMakeLists.txt b/Tests/UseSWIG/ModuleVersion2/CMakeLists.txt index 3f9d363..452f9e2 100644 --- a/Tests/UseSWIG/ModuleVersion2/CMakeLists.txt +++ b/Tests/UseSWIG/ModuleVersion2/CMakeLists.txt @@ -16,6 +16,7 @@ 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 578825f..25dd6b3 100644 --- a/Tests/UseSWIG/MultipleModules/CMakeLists.txt +++ b/Tests/UseSWIG/MultipleModules/CMakeLists.txt @@ -19,6 +19,7 @@ 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 a5e3eed..a1651fb 100644 --- a/Tests/UseSWIG/MultiplePython/CMakeLists.txt +++ b/Tests/UseSWIG/MultiplePython/CMakeLists.txt @@ -17,6 +17,7 @@ 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 3e266c3..d0855bf 100644 --- a/Tests/UseSWIG/UseTargetINCLUDE_DIRECTORIES/CMakeLists.txt +++ b/Tests/UseSWIG/UseTargetINCLUDE_DIRECTORIES/CMakeLists.txt @@ -9,6 +9,7 @@ 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) |