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, next has been updated
via a87bb9050cef6332464efbf44fa7a24ffce80dbc (commit)
via 1a882c7a26e26e91e7e9d3473c1ac2f5b12b1a1c (commit)
via c479a06d80bd4b4eecb0923fc7cafcd5a82b3dbc (commit)
via 14779f87d2b09631988e31aa956feac3425d74f3 (commit)
via c628fbc40df01739df9b8134719ee7014897e84e (commit)
via 4b9188825a0c61ce370855d2ce42da97dc7b9a7f (commit)
via e31caa69b9104d350ff89a9eecf6f9548c477b95 (commit)
via 8e23c0bd6882d51b9a080fc0a4f194cf89f30fbe (commit)
via 49cc8f44b35cee7ec6b68026da0d6b7dea60c135 (commit)
via 498633bc109e061c1179c00448231a7a0953b5a7 (commit)
via 293f53882ee103645dad14ecd2dfa47a6e448395 (commit)
via 189cd28236ef8fd9eb0be3efe2f9e816df389479 (commit)
via 1ba508865e3fdd034ca08a954e217aa2e04b2121 (commit)
via 8f26ed43b1873021aeddf211357ac87f981248f5 (commit)
via aad04efe5eb483462d118cae8b76e64795a53810 (commit)
from feba0b9f7667f7307b8842fe50b50553ac4fce75 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a87bb9050cef6332464efbf44fa7a24ffce80dbc
commit a87bb9050cef6332464efbf44fa7a24ffce80dbc
Merge: feba0b9 1a882c7
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jun 6 09:54:31 2013 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Jun 6 09:54:31 2013 -0400
Merge topic 'test-release' into next
1a882c7 Merge branch 'release' into test-release
c479a06 CMake 2.8.11.1
14779f8 Merge branch 'fix-genex-HEAD-target' into release
c628fbc Merge branch 'xcode-framework-paths' into release
4b91888 Merge branch 'fix-include_directories-whitespace-handling' into
release
e31caa6 Merge branch 'fix-qt4_use_modules-QtAx' into release
8e23c0b Merge branch 'find-Qt4-granular-modules' into release
49cc8f4 Merge branch 'escape-regex-specials-in-path' into release
498633b Merge branch 'FindBoost-normalize-slashes' into release
293f538 Merge branch 'ExternalData-no-re-stage' into release
189cd28 Merge branch 'test-INCLUDE_DIRECTORIES-genex-read' into release
1ba5088 Merge branch 'fix-INCLUDE_DIRECTORIES-genex-read' into release
8f26ed4 Merge branch 'fix-try_compile-library-spaces' into release
aad04ef Merge branch 'fix-FileIsDirectory-SEGV' into release
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1a882c7a26e26e91e7e9d3473c1ac2f5b12b1a1c
commit 1a882c7a26e26e91e7e9d3473c1ac2f5b12b1a1c
Merge: d3c8688 c479a06
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jun 5 09:53:34 2013 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Jun 5 09:53:34 2013 -0400
Merge branch 'release' into test-release
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c479a06d80bd4b4eecb0923fc7cafcd5a82b3dbc
commit c479a06d80bd4b4eecb0923fc7cafcd5a82b3dbc
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jun 5 09:47:09 2013 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Jun 5 09:47:09 2013 -0400
CMake 2.8.11.1
diff --git a/ChangeLog.manual b/ChangeLog.manual
index a0da0d5..ff3074d 100644
--- a/ChangeLog.manual
+++ b/ChangeLog.manual
@@ -1,3 +1,26 @@
+Changes in CMake 2.8.11.1 (since 2.8.11)
+----------------------------------------
+Brad King (5):
+ ExternalData: Do not re-stage staged object files
+ try_compile: Fix quoting of libraries in generated CMakeLists.txt
+ KWSys: Fix SystemTools::FileIsDirectory with long paths (#14176)
+ FindBoost: Fix handling of \ in input paths (#14179)
+ Xcode: Fix framework search paths in STATIC library targets (#14191)
+
+Modestas Vainius (1):
+ Fix test failures caused by regexp-sensitive characters in the build
paths
+
+Stephen Kelly (9):
+ include_directories: Fix handling of empty or space-only entries
+ try_compile: Trim whitespace from LINK_LIBRARIES entries
+ cmTarget: Remove some hardcoding of transitive property names.
+ GenexEval: Extract a getLinkedTargetsContent from TargetPropertyNode.
+ GenexEval: Fix evaluation of INCLUDE_DIRECTORIES target property.
+ GenexEval: Test evaluation of INCLUDE_DIRECTORIES target property.
+ FindQt4: Don't fail if certain Qt modules are unavailable.
+ Qt4Macros: Handle Qt ActiveX libraries in qt4_use_modules.
+ Genex: Fix the HEAD target used for evaluated expressions
+
Changes in CMake 2.8.11 (since 2.8.11-rc4)
----------------------------------------
None
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index f2792d6..34946af 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -2,5 +2,5 @@
set(CMake_VERSION_MAJOR 2)
set(CMake_VERSION_MINOR 8)
set(CMake_VERSION_PATCH 11)
-set(CMake_VERSION_TWEAK 0)
+set(CMake_VERSION_TWEAK 1)
#set(CMake_VERSION_RC 0)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=14779f87d2b09631988e31aa956feac3425d74f3
commit 14779f87d2b09631988e31aa956feac3425d74f3
Merge: c628fbc 5b22235
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jun 5 09:44:52 2013 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Jun 5 09:44:52 2013 -0400
Merge branch 'fix-genex-HEAD-target' into release
diff --cc Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
index a80a58f,bcfbe3c..4a5aa30
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
@@@ -109,26 -109,12 +109,31 @@@ set_property(TARGET libbad APPEND PROPE
INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/bad"
)
+ add_library(lib6 SHARED other.cpp)
+ add_library(lib7 SHARED other.cpp)
+ target_link_libraries(lib7
$<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:lib6>)
+ target_include_directories(lib7 PUBLIC
$<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:/lib7/include>)
+ add_custom_target(head_target_test "some_bogus_custom_tool
\"$<TARGET_PROPERTY:lib7,INCLUDE_DIRECTORIES>$<TARGET_PROPERTY:lib7,INTERFACE_INCLUDE_DIRECTORIES>\"")
+add_library(includes_source_good empty.cpp)
+target_include_directories(includes_source_good
+ INTERFACE
+ "${CMAKE_CURRENT_BINARY_DIR}/good"
+ "${CMAKE_CURRENT_BINARY_DIR}/othergood/"
+)
+add_library(includes_source_bad empty.cpp)
+target_include_directories(includes_source_bad
+ INTERFACE
+ "${CMAKE_CURRENT_BINARY_DIR}/bad"
+)
+
+add_library(includes_proxy SHARED empty.cpp)
+target_link_libraries(includes_proxy includes_source_good)
+target_link_libraries(includes_proxy LINK_INTERFACE_LIBRARIES
includes_source_bad)
+add_executable(copy_includes copy_includes.cpp)
+target_include_directories(copy_includes PRIVATE
$<TARGET_PROPERTY:includes_proxy,INCLUDE_DIRECTORIES>)
+
+
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/lib5.cpp" "#include \"common.h\"\n")
add_library(lib5 "${CMAKE_CURRENT_BINARY_DIR}/lib5.cpp")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c628fbc40df01739df9b8134719ee7014897e84e
commit c628fbc40df01739df9b8134719ee7014897e84e
Merge: 4b91888 21a0bea
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jun 5 09:44:42 2013 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Jun 5 09:44:42 2013 -0400
Merge branch 'xcode-framework-paths' into release
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b9188825a0c61ce370855d2ce42da97dc7b9a7f
commit 4b9188825a0c61ce370855d2ce42da97dc7b9a7f
Merge: e31caa6 b8cc6f4
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jun 5 09:44:13 2013 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Jun 5 09:44:13 2013 -0400
Merge branch 'fix-include_directories-whitespace-handling' into release
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e31caa69b9104d350ff89a9eecf6f9548c477b95
commit e31caa69b9104d350ff89a9eecf6f9548c477b95
Merge: 8e23c0b ce0c480
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jun 3 14:02:12 2013 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Jun 3 14:02:12 2013 -0400
Merge branch 'fix-qt4_use_modules-QtAx' into release
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e23c0bd6882d51b9a080fc0a4f194cf89f30fbe
commit 8e23c0bd6882d51b9a080fc0a4f194cf89f30fbe
Merge: 49cc8f4 b8af46c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jun 3 14:02:07 2013 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Jun 3 14:02:07 2013 -0400
Merge branch 'find-Qt4-granular-modules' into release
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49cc8f44b35cee7ec6b68026da0d6b7dea60c135
commit 49cc8f44b35cee7ec6b68026da0d6b7dea60c135
Merge: 498633b c9b75dc
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jun 3 13:59:44 2013 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Jun 3 13:59:44 2013 -0400
Merge branch 'escape-regex-specials-in-path' into release
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=498633bc109e061c1179c00448231a7a0953b5a7
commit 498633bc109e061c1179c00448231a7a0953b5a7
Merge: 293f538 363825c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri May 31 09:37:46 2013 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri May 31 09:37:46 2013 -0400
Merge branch 'FindBoost-normalize-slashes' into release
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=293f53882ee103645dad14ecd2dfa47a6e448395
commit 293f53882ee103645dad14ecd2dfa47a6e448395
Merge: 189cd28 c35961b
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri May 31 09:37:40 2013 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri May 31 09:37:40 2013 -0400
Merge branch 'ExternalData-no-re-stage' into release
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=189cd28236ef8fd9eb0be3efe2f9e816df389479
commit 189cd28236ef8fd9eb0be3efe2f9e816df389479
Merge: 1ba5088 07f9e15
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri May 31 09:37:32 2013 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri May 31 09:37:32 2013 -0400
Merge branch 'test-INCLUDE_DIRECTORIES-genex-read' into release
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ba508865e3fdd034ca08a954e217aa2e04b2121
commit 1ba508865e3fdd034ca08a954e217aa2e04b2121
Merge: 8f26ed4 3aa9ce4
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri May 31 09:37:27 2013 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri May 31 09:37:27 2013 -0400
Merge branch 'fix-INCLUDE_DIRECTORIES-genex-read' into release
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f26ed43b1873021aeddf211357ac87f981248f5
commit 8f26ed43b1873021aeddf211357ac87f981248f5
Merge: aad04ef e537544
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri May 31 09:37:20 2013 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri May 31 09:37:20 2013 -0400
Merge branch 'fix-try_compile-library-spaces' into release
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aad04efe5eb483462d118cae8b76e64795a53810
commit aad04efe5eb483462d118cae8b76e64795a53810
Merge: 0ad0c37 045d6ae
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri May 31 09:37:10 2013 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri May 31 09:37:10 2013 -0400
Merge branch 'fix-FileIsDirectory-SEGV' into release
-----------------------------------------------------------------------
Summary of changes:
ChangeLog.manual | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
