[Cmake-commits] CMake branch, master, updated. v3.14.4-1026-g1db0edb
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 1db0edb2a65b272a7c91e719e818da2e2ce49fb5 (commit) from e025495b8500f9aaf6745571ffdb48a6218e7929 (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=1db0edb2a65b272a7c91e719e818da2e2ce49fb5 commit 1db0edb2a65b272a7c91e719e818da2e2ce49fb5 Author: Kitware Robot AuthorDate: Tue May 21 00:01:06 2019 -0400 Commit: Kitware Robot CommitDate: Tue May 21 00:01:06 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 63d5f3d..4303c25 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 14) -set(CMake_VERSION_PATCH 20190520) +set(CMake_VERSION_PATCH 20190521) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.14.4-1025-ge025495
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 e025495b8500f9aaf6745571ffdb48a6218e7929 (commit)
via a9fb9a8774a7b1dd411542d1d14fb537968e32f1 (commit)
via f945c3e755469457bd1c89fe7c9153521005f43f (commit)
via 1ded3599d698c1bfa0243d58ece8b619d2900a17 (commit)
via 827da1119ef2d0978dd6dbc58aeee803e43b2455 (commit)
via adc3459707c4c942b547eb57d02a82b8d5085962 (commit)
via 0d41b45cc931530d5dbc51674699f4da2290a6d3 (commit)
via a9180ccf9a9e845658ba455e2dbc2447b18d2654 (commit)
via d745551fb6311f5db6e8133df63a7fc410e8a68b (commit)
via 9a182c9e5b36ba68fc91b53e3d755c263ee3d0ef (commit)
via e9b0063e8e0f2fcb5cc4239a06deec17c49688c4 (commit)
via b6412e3e38ba22bf816445f19394e7c8027c186f (commit)
via 7d7f31161d65d8b1f460eaf23e1b092bdaf7c238 (commit)
via d688c4c19d0ec6d639ba7047e786bdacb7a4b45b (commit)
via 0723582208dda7da9815a319973eed596c61a44c (commit)
via 086c51dc045c75662500b39da3341af83281d6df (commit)
from 28ee31149030c75c32ebbf134502a9d020dbd54b (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=e025495b8500f9aaf6745571ffdb48a6218e7929
commit e025495b8500f9aaf6745571ffdb48a6218e7929
Merge: a9fb9a8 f945c3e
Author: Brad King
AuthorDate: Mon May 20 14:55:53 2019 +
Commit: Kitware Robot
CommitDate: Mon May 20 10:56:22 2019 -0400
Merge topic 'makefiles_additional_clean_files'
f945c3e755 Tests: Extend MakeClean test to cover subdirectories without
targets
1ded3599d6 Makefiles: Process ADDTIONAL_CLEAN_FILES dir prop at directory
level
827da1119e Makefiles: Make build root targets "all", "clean" and
"preinstall" recursive
adc3459707 Makefiles: Avoid pointer repurposing
0d41b45cc9 Makefiles: Inline range loop range arguments
Acked-by: Kitware Robot
Merge-request: !3338
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9fb9a8774a7b1dd411542d1d14fb537968e32f1
commit a9fb9a8774a7b1dd411542d1d14fb537968e32f1
Merge: 28ee311 a9180cc
Author: Brad King
AuthorDate: Mon May 20 14:55:11 2019 +
Commit: Kitware Robot
CommitDate: Mon May 20 10:55:27 2019 -0400
Merge topic 'ninja-swift'
a9180ccf9a Tests: add a check for the Swift compiler
d745551fb6 Help: add some initial documentation for Swift support
9a182c9e5b Auxiliary: update vim syntax highlighting
e9b0063e8e Modules: add build rules for Swift Ninja support
b6412e3e38 Ninja: add placeholders to support Swift build
7d7f31161d Ninja: add support for Swift's output-file-map.json
d688c4c19d Swift: remove unnecessary unreleased Ninja infrastructure
0723582208 Swift: Detect compiler version
...
Acked-by: Kitware Robot
Merge-request: !3297
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f945c3e755469457bd1c89fe7c9153521005f43f
commit f945c3e755469457bd1c89fe7c9153521005f43f
Author: Sebastian Holtermann
AuthorDate: Fri May 17 10:30:34 2019 +0200
Commit: Sebastian Holtermann
CommitDate: Sat May 18 12:27:29 2019 +0200
Tests: Extend MakeClean test to cover subdirectories without targets
This adds a subdirectory to the MakeClean test, in which files are added to
the `ADDITIONAL_CLEAN_FILES` directory property, but which holds no targets.
diff --git a/Tests/MakeClean/ToClean/CMakeLists.txt
b/Tests/MakeClean/ToClean/CMakeLists.txt
index 5d84e6c..6f16d12 100644
--- a/Tests/MakeClean/ToClean/CMakeLists.txt
+++ b/Tests/MakeClean/ToClean/CMakeLists.txt
@@ -2,45 +2,56 @@ cmake_minimum_required(VERSION 3.14)
project(ToClean)
# Utility variables
-set(TSD ${ToClean_SOURCE_DIR})
-set(TBD ${ToClean_BINARY_DIR})
+set(CSD ${CMAKE_CURRENT_SOURCE_DIR})
+set(CBD ${CMAKE_CURRENT_BINARY_DIR})
set(CLEAN_FILE_CONTENT "File registered for cleaning.\n")
# Lists build-time-generated files that should be cleaned away
-set(TOCLEAN_FILES)
+set_property(GLOBAL PROPERTY TOCLEAN_FILES "")
+function(addCleanFile FILENAME)
+ set_property(GLOBAL APPEND PROPERTY TOCLEAN_FILES "${FILENAME}")
+endfunction()
+function(writeCleanFile FILENAME)
+ file(WRITE "${FILENAME}" ${CLEAN_FILE_CONTENT})
+endfunction()
# Build a simple project whose compiled objects should be cleaned.
add_executable(toclean toclean.cxx)
-list(APPEND TOCLEAN_FILES
-
"${TBD}${CMAKE_FILES_DIRECTORY}/toclean.dir/toclean.cxx${CMAKE_CXX_OUTPUT_EXTENSION}")
+addCleanFile("${CBD}${CMAKE_FILES_DIRECTORY}/toclean.dir/toclean.cxx${CMAKE_CXX_OUTPUT_EXTENSION}")
+
+# Create a post build custom command that copies the toclean output executable
+# to a custom
[Cmake-commits] CMake branch, master, updated. v3.14.4-1009-g28ee311
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 28ee31149030c75c32ebbf134502a9d020dbd54b (commit)
via 21c74faa1ad75aa52d465467908edcb888cb53bf (commit)
from 9860b4c5e8756cb58c4cdfc27a14194f823aa0ab (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=28ee31149030c75c32ebbf134502a9d020dbd54b
commit 28ee31149030c75c32ebbf134502a9d020dbd54b
Merge: 9860b4c 21c74fa
Author: Brad King
AuthorDate: Mon May 20 14:03:48 2019 +
Commit: Kitware Robot
CommitDate: Mon May 20 10:04:00 2019 -0400
Merge topic 'FindPNG-static-define'
21c74faa1a FindPNG: Fix definitions on imported target
Acked-by: Kitware Robot
Acked-by: Paolo Lammens
Merge-request: !3337
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=21c74faa1ad75aa52d465467908edcb888cb53bf
commit 21c74faa1ad75aa52d465467908edcb888cb53bf
Author: Axel Huebl
AuthorDate: Fri May 17 17:08:37 2019 +0200
Commit: Brad King
CommitDate: Fri May 17 12:07:18 2019 -0400
FindPNG: Fix definitions on imported target
The `INTERFACE_COMPILE_DEFINITIONS` property should not have ``-D``
in its value.
diff --git a/Modules/FindPNG.cmake b/Modules/FindPNG.cmake
index 2208b48..a7908c5 100644
--- a/Modules/FindPNG.cmake
+++ b/Modules/FindPNG.cmake
@@ -100,13 +100,14 @@ if(ZLIB_FOUND)
# No need to define PNG_USE_DLL here, because it's default for
Cygwin.
else()
set (PNG_DEFINITIONS -DPNG_STATIC)
+ set(_PNG_COMPILE_DEFINITIONS PNG_STATIC)
endif()
endif ()
if(NOT TARGET PNG::PNG)
add_library(PNG::PNG UNKNOWN IMPORTED)
set_target_properties(PNG::PNG PROPERTIES
- INTERFACE_COMPILE_DEFINITIONS "${PNG_DEFINITIONS}"
+ INTERFACE_COMPILE_DEFINITIONS "${_PNG_COMPILE_DEFINITIONS}"
INTERFACE_INCLUDE_DIRECTORIES "${PNG_INCLUDE_DIRS}"
INTERFACE_LINK_LIBRARIES ZLIB::ZLIB)
if(EXISTS "${PNG_LIBRARY}")
@@ -129,6 +130,8 @@ if(ZLIB_FOUND)
IMPORTED_LOCATION_DEBUG "${PNG_LIBRARY_DEBUG}")
endif()
endif()
+
+ unset(_PNG_COMPILE_DEFINITIONS)
endif ()
if (PNG_PNG_INCLUDE_DIR AND EXISTS "${PNG_PNG_INCLUDE_DIR}/png.h")
---
Summary of changes:
Modules/FindPNG.cmake | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.14.4-1007-g9860b4c
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 9860b4c5e8756cb58c4cdfc27a14194f823aa0ab (commit)
via 73a829e0785a497069f55d8b2be2fb7b859a3e20 (commit)
from 96cf96d4ebd27a1cc725c938899a23a2ddd25334 (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=9860b4c5e8756cb58c4cdfc27a14194f823aa0ab
commit 9860b4c5e8756cb58c4cdfc27a14194f823aa0ab
Merge: 96cf96d 73a829e
Author: Brad King
AuthorDate: Mon May 20 14:02:45 2019 +
Commit: Kitware Robot
CommitDate: Mon May 20 10:02:57 2019 -0400
Merge topic 'interface-library-export-properties'
73a829e078 InterfaceLibrary: Whitelist EXPORT_PROPERTIES property
Acked-by: Kitware Robot
Merge-request: !3336
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=73a829e0785a497069f55d8b2be2fb7b859a3e20
commit 73a829e0785a497069f55d8b2be2fb7b859a3e20
Author: Brad King
AuthorDate: Fri May 17 09:14:45 2019 -0400
Commit: Brad King
CommitDate: Fri May 17 09:20:04 2019 -0400
InterfaceLibrary: Whitelist EXPORT_PROPERTIES property
Fixes: #19261
diff --git a/Help/manual/cmake-buildsystem.7.rst
b/Help/manual/cmake-buildsystem.7.rst
index 1ad3453..8cd6e68 100644
--- a/Help/manual/cmake-buildsystem.7.rst
+++ b/Help/manual/cmake-buildsystem.7.rst
@@ -977,6 +977,7 @@ are:
* Properties matching ``INTERFACE_*``
* Built-in properties matching ``COMPATIBLE_INTERFACE_*``
* ``EXPORT_NAME``
+* ``EXPORT_PROPERTIES``
* ``IMPORTED``
* ``MANUALLY_ADDED_DEPENDENCIES``
* ``NAME``
diff --git a/Source/cmTargetPropertyComputer.cxx
b/Source/cmTargetPropertyComputer.cxx
index 994fcf7..3f763af 100644
--- a/Source/cmTargetPropertyComputer.cxx
+++ b/Source/cmTargetPropertyComputer.cxx
@@ -63,6 +63,7 @@ bool cmTargetPropertyComputer::WhiteListedInterfaceProperty(
builtIns.insert("COMPATIBLE_INTERFACE_NUMBER_MIN");
builtIns.insert("COMPATIBLE_INTERFACE_STRING");
builtIns.insert("EXPORT_NAME");
+builtIns.insert("EXPORT_PROPERTIES");
builtIns.insert("IMPORTED");
builtIns.insert("IMPORTED_GLOBAL");
builtIns.insert("MANUALLY_ADDED_DEPENDENCIES");
diff --git a/Tests/ExportImport/Export/Interface/CMakeLists.txt
b/Tests/ExportImport/Export/Interface/CMakeLists.txt
index fd55c42..22a4ef6 100644
--- a/Tests/ExportImport/Export/Interface/CMakeLists.txt
+++ b/Tests/ExportImport/Export/Interface/CMakeLists.txt
@@ -41,6 +41,8 @@ install(FILES
add_library(cmakeonly INTERFACE)
set_property(TARGET cmakeonly PROPERTY INTERFACE_COMPILE_DEFINITIONS
[[DEF="\"\$\B"]])
+set_property(TARGET cmakeonly PROPERTY custom_property CustomPropertyValue)
+set_property(TARGET cmakeonly PROPERTY EXPORT_PROPERTIES custom_property)
install(TARGETS headeronly sharediface use_auto_type use_c_restrict
source_target
cmakeonly
diff --git a/Tests/ExportImport/Import/Interface/CMakeLists.txt
b/Tests/ExportImport/Import/Interface/CMakeLists.txt
index c850508..a07a5b3 100644
--- a/Tests/ExportImport/Import/Interface/CMakeLists.txt
+++ b/Tests/ExportImport/Import/Interface/CMakeLists.txt
@@ -109,4 +109,12 @@ foreach(ns exp bld)
"not\n"
" " [[DEF="\"\$\B"]] "\n")
endif()
+ get_property(custom TARGET ${ns}::cmakeonly PROPERTY custom_property)
+ if(NOT custom STREQUAL "CustomPropertyValue")
+message(SEND_ERROR
+ "${ns}::cmakeonly property custom_property is:\n"
+ " ${custom}\n"
+ "not\n"
+ " CustomPropertyValue\n")
+ endif()
endforeach()
---
Summary of changes:
Help/manual/cmake-buildsystem.7.rst| 1 +
Source/cmTargetPropertyComputer.cxx| 1 +
Tests/ExportImport/Export/Interface/CMakeLists.txt | 2 ++
Tests/ExportImport/Import/Interface/CMakeLists.txt | 8
4 files changed, 12 insertions(+)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
