diff options
author | Brad King <brad.king@kitware.com> | 2018-07-03 15:09:29 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2018-07-03 16:48:02 (GMT) |
commit | 8f2b483c0642589bec51a4caf26cd8c7fa75dd32 (patch) | |
tree | 7a58104042bec2c7be4b86121d7d92186588ca47 /Tests/UseSWIG/UseTargetINCLUDE_DIRECTORIES | |
parent | c4b1c0751d48c1c3b7ccf92f1306a0a162cd249e (diff) | |
parent | 38ffcedd26af077cbfb0e0c2c96c5018df23849b (diff) | |
download | CMake-8f2b483c0642589bec51a4caf26cd8c7fa75dd32.zip CMake-8f2b483c0642589bec51a4caf26cd8c7fa75dd32.tar.gz CMake-8f2b483c0642589bec51a4caf26cd8c7fa75dd32.tar.bz2 |
Merge branch 'backport-UseSWIG-legacy-targets' into UseSWIG-legacy-targets
Resolve conflicts by integrating changes from both sides.
Diffstat (limited to 'Tests/UseSWIG/UseTargetINCLUDE_DIRECTORIES')
-rw-r--r-- | Tests/UseSWIG/UseTargetINCLUDE_DIRECTORIES/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
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) |