This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 6683edc80354b94233b6b87b77d87c12dfb80c61 (commit)
via d101446a56e9a743813f9b6dd84e479cd7e58d79 (commit)
via 7f9652773a386ea6bf7eec66f2c58174ebe1b5d4 (commit)
via 5c60e80c46fff4c3f8a5cbe8a60eb7dabaae566b (commit)
via 8dac71ee72d68baf7925147e65f90ff60d7e7212 (commit)
via 0f3d7a1398f943b2417b317fa28c4a7cd5f7c6de (commit)
via 89e3e62e138ca1e666d5b4c7a9fa8198c4241d11 (commit)
via 84ecbf44b6d3953bb7f33dd48c4382bc3c15f519 (commit)
via 890be0145def8d9c469fcaf6db1e7e6bc485f6cc (commit)
via f598166124eee89f21be6d518a09cc37d767c5d1 (commit)
via 8f2b483c0642589bec51a4caf26cd8c7fa75dd32 (commit)
via 38ffcedd26af077cbfb0e0c2c96c5018df23849b (commit)
via 9c01704e9fb6b1f34aa52b1299b1a0dcc2de817e (commit)
via 91f4adb0284b20c23223bc0243aa96ff8bbc1941 (commit)
from 326ebdf12a59e7a115d7326299eb6be54316f34e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6683edc80354b94233b6b87b77d87c12dfb80c61
commit 6683edc80354b94233b6b87b77d87c12dfb80c61
Merge: d101446 0f3d7a1
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jul 5 11:41:56 2018 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Jul 5 11:41:56 2018 -0400
Merge branch 'release-3.12'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d101446a56e9a743813f9b6dd84e479cd7e58d79
commit d101446a56e9a743813f9b6dd84e479cd7e58d79
Merge: 7f96527 89e3e62
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jul 5 15:41:16 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Jul 5 11:41:23 2018 -0400
Merge topic 'doc-add_compile_definitions'
89e3e62e13 Help: fix add_compile_definitions() documentation
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2192
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f9652773a386ea6bf7eec66f2c58174ebe1b5d4
commit 7f9652773a386ea6bf7eec66f2c58174ebe1b5d4
Merge: 5c60e80 8f2b483
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jul 5 15:39:02 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Jul 5 11:39:09 2018 -0400
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 <kwro...@kitware.com>
Merge-request: !2188
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c60e80c46fff4c3f8a5cbe8a60eb7dabaae566b
commit 5c60e80c46fff4c3f8a5cbe8a60eb7dabaae566b
Merge: 8dac71e 91f4adb
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jul 5 15:37:57 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Jul 5 11:38:03 2018 -0400
Merge topic 'FindLua-CMP0012'
91f4adb028 FindLua: Set CMP0012 to NEW for the revised search code
Acked-by: Kitware Robot <kwro...@kitware.com>
Acked-by: Rolf Eike Beer <e...@sf-mail.de>
Acked-by: Alexander Grund <git...@grundis.de>
Merge-request: !2189
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8dac71ee72d68baf7925147e65f90ff60d7e7212
commit 8dac71ee72d68baf7925147e65f90ff60d7e7212
Merge: 326ebdf 9c01704
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jul 5 15:36:10 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Jul 5 11:36:25 2018 -0400
Merge topic 'gitignore-vscode'
9c01704e9f gitignore: Ignore a .vscode directory in the source tree
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2182
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f2b483c0642589bec51a4caf26cd8c7fa75dd32
commit 8f2b483c0642589bec51a4caf26cd8c7fa75dd32
Merge: c4b1c07 38ffced
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jul 3 11:09:29 2018 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jul 3 12:48:02 2018 -0400
Merge branch 'backport-UseSWIG-legacy-targets' into UseSWIG-legacy-targets
Resolve conflicts by integrating changes from both sides.
diff --cc Modules/UseSWIG.cmake
index 851101b,b306181..8424a9f
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@@ -322,19 -344,11 +358,19 @@@ function(SWIG_ADD_SOURCE_TO_MODULE nam
if (include_directories)
list (APPEND swig_source_file_flags
"$<$<BOOL:${include_directories}>:-I$<JOIN:${include_directories},$<SEMICOLON>-I>>")
endif()
- set (property "$<TARGET_PROPERTY:${name},SWIG_INCLUDE_DIRECTORIES>")
- list (APPEND swig_source_file_flags
"$<$<BOOL:${property}>:-I$<JOIN:$<TARGET_GENEX_EVAL:${name},${property}>,$<SEMICOLON>-I>>")
- set (property "$<TARGET_PROPERTY:${name},INCLUDE_DIRECTORIES>")
+ set (property "$<TARGET_PROPERTY:${target_name},SWIG_INCLUDE_DIRECTORIES>")
+ list (APPEND swig_source_file_flags
"$<$<BOOL:${property}>:-I$<JOIN:$<TARGET_GENEX_EVAL:${target_name},${property}>,$<SEMICOLON>-I>>")
++ set (property "$<TARGET_PROPERTY:${target_name},INCLUDE_DIRECTORIES>")
+ get_source_file_property(use_target_include_dirs "${infile}"
USE_TARGET_INCLUDE_DIRECTORIES)
+ if (use_target_include_dirs)
+ list (APPEND swig_source_file_flags
"$<$<BOOL:${property}>:-I$<JOIN:${property},$<SEMICOLON>-I>>")
+ elseif(use_target_include_dirs STREQUAL "NOTFOUND")
+ # not defined at source level, rely on target level
- list (APPEND swig_source_file_flags
"$<$<AND:$<BOOL:$<TARGET_PROPERTY:${name},SWIG_USE_TARGET_INCLUDE_DIRECTORIES>>,$<BOOL:${property}>>:-I$<JOIN:${property},$<SEMICOLON>-I>>")
++ list (APPEND swig_source_file_flags
"$<$<AND:$<BOOL:$<TARGET_PROPERTY:${target_name},SWIG_USE_TARGET_INCLUDE_DIRECTORIES>>,$<BOOL:${property}>>:-I$<JOIN:${property},$<SEMICOLON>-I>>")
+ endif()
- set (property "$<TARGET_PROPERTY:${name},SWIG_COMPILE_DEFINITIONS>")
- list (APPEND swig_source_file_flags
"$<$<BOOL:${property}>:-D$<JOIN:$<TARGET_GENEX_EVAL:${name},${property}>,$<SEMICOLON>-D>>")
+ set (property "$<TARGET_PROPERTY:${target_name},SWIG_COMPILE_DEFINITIONS>")
+ list (APPEND swig_source_file_flags
"$<$<BOOL:${property}>:-D$<JOIN:$<TARGET_GENEX_EVAL:${target_name},${property}>,$<SEMICOLON>-D>>")
get_source_file_property (compile_definitions "${infile}"
COMPILE_DEFINITIONS)
if (compile_definitions)
list (APPEND swig_source_file_flags
"$<$<BOOL:${compile_definitions}>:-D$<JOIN:${compile_definitions},$<SEMICOLON>-D>>")
diff --cc Tests/UseSWIG/UseTargetINCLUDE_DIRECTORIES/CMakeLists.txt
index 3e266c3,0000000..d0855bf
mode 100644,000000..100644
--- a/Tests/UseSWIG/UseTargetINCLUDE_DIRECTORIES/CMakeLists.txt
+++ b/Tests/UseSWIG/UseTargetINCLUDE_DIRECTORIES/CMakeLists.txt
@@@ -1,45 -1,0 +1,46 @@@
+cmake_minimum_required(VERSION 3.1)
+
+project(TestUseTargetINCLUDE_DIRECTORIES CXX)
+
+include(CTest)
+
+find_package(SWIG REQUIRED)
+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)
+set_property(SOURCE "example.i" PROPERTY COMPILE_OPTIONS -includeall)
+
+swig_add_library(example1
+ LANGUAGE python
+ OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/example1"
+ SOURCES example.i ../example.cxx)
+set_target_properties (example1 PROPERTIES
+ INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/.."
+ SWIG_USE_TARGET_INCLUDE_DIRECTORIES TRUE
+ OUTPUT_NAME example1
+ LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/example1"
+ ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/example1"
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/example1")
+target_link_libraries(example1 PRIVATE Python3::Python)
+
+
+# Check that source property override target property
+set_property(SOURCE "example.i" PROPERTY USE_TARGET_INCLUDE_DIRECTORIES TRUE)
+
+swig_add_library(example2
+ LANGUAGE python
+ OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/example2"
+ SOURCES example.i ../example.cxx)
+set_target_properties (example2 PROPERTIES
+ INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/.."
+ SWIG_USE_TARGET_INCLUDE_DIRECTORIES FALSE
+ OUTPUT_NAME example2
+ LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/example2"
+ ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/example2"
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/example2")
+target_link_libraries(example2 PRIVATE Python3::Python)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9c01704e9fb6b1f34aa52b1299b1a0dcc2de817e
commit 9c01704e9fb6b1f34aa52b1299b1a0dcc2de817e
Author: Dakota Hawkins <dakotahawk...@gmail.com>
AuthorDate: Sun Jul 1 14:40:50 2018 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jul 3 11:48:14 2018 -0400
gitignore: Ignore a .vscode directory in the source tree
diff --git a/.gitignore b/.gitignore
index 22e9800..1a257d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,6 @@ Testing
# Visual Studio work directory
.vs/
+
+# Visual Studio Code
+.vscode/
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 3 +
Help/command/add_compile_definitions.rst | 6 +-
Modules/FindLua.cmake | 5 +
Modules/UseSWIG.cmake | 168 ++++++++++++++-------
Tests/UseSWIG/BasicConfiguration.cmake | 1 +
Tests/UseSWIG/ModuleVersion2/CMakeLists.txt | 1 +
Tests/UseSWIG/MultipleModules/CMakeLists.txt | 1 +
Tests/UseSWIG/MultiplePython/CMakeLists.txt | 1 +
.../UseTargetINCLUDE_DIRECTORIES/CMakeLists.txt | 1 +
9 files changed, 129 insertions(+), 58 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
