[Cmake-commits] CMake branch, master, updated. v2.8.10.2-301-gb575ead
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 b575eadcdaf55fa4fe9a9d2dd8cb5e530365eae9 (commit) via 12d87c04253bd203a9b8a510b1772291527d441c (commit) via e28ce2483dbdc620aa92e2ba0d86e8923dcdb296 (commit) via 354ecc1e1f28b9f2412fa015064353c6e20cfe92 (commit) via d842d9062297435747117bd74b6e184cedd345cc (commit) via 711e2b3b5c674d4f754b5b214d511be6ce7e8f4d (commit) from d73c4057edeca78fcefbcaf9fd3768e2c0e19e07 (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=b575eadcdaf55fa4fe9a9d2dd8cb5e530365eae9 commit b575eadcdaf55fa4fe9a9d2dd8cb5e530365eae9 Merge: d73c405 12d87c0 Author: David Cole david.c...@kitware.com AuthorDate: Tue Dec 11 13:43:50 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Dec 11 13:43:50 2012 -0500 Merge topic 'add-timestamp-subcommands' 12d87c0 CMake: Fix dashboard build errors and warnings e28ce24 CMake: Fix dashboard test failure 354ecc1 CMake: Fix dashboard warnings d842d90 CMake: Stylistic changes and documentation tweaks 711e2b3 CMake: Add TIMESTAMP subcommand to string and file commands --- Summary of changes: Source/cmBootstrapCommands.cxx |1 + Source/cmFileCommand.cxx | 57 + Source/cmFileCommand.h |9 ++ Source/cmStringCommand.cxx | 54 Source/cmStringCommand.h | 30 +- Source/cmTimestamp.cxx | 134 Source/cmTimestamp.h | 40 ++ Tests/CMakeTests/File-TIMESTAMP-BadArg1.cmake |1 + Tests/CMakeTests/File-TIMESTAMP-NoFile.cmake |2 + Tests/CMakeTests/File-TIMESTAMP-NotBogus.cmake | 24 Tests/CMakeTests/File-TIMESTAMP-Works.cmake|2 + Tests/CMakeTests/FileTest.cmake.in | 12 ++ .../String-TIMESTAMP-AllSpecifiers.cmake | 11 ++ Tests/CMakeTests/String-TIMESTAMP-BadArg1.cmake|1 + Tests/CMakeTests/String-TIMESTAMP-BadArg2.cmake|1 + Tests/CMakeTests/String-TIMESTAMP-BadArg3.cmake|1 + .../String-TIMESTAMP-CustomFormatLocal.cmake |2 + .../String-TIMESTAMP-CustomFormatUTC.cmake |2 + .../String-TIMESTAMP-DefaultFormatLocal.cmake |2 + .../String-TIMESTAMP-DefaultFormatUTC.cmake|2 + .../String-TIMESTAMP-IncompleteSpecifier.cmake |2 + .../String-TIMESTAMP-UnknownSpecifier.cmake|2 + Tests/CMakeTests/StringTest.cmake.in | 30 + 23 files changed, 421 insertions(+), 1 deletions(-) create mode 100644 Source/cmTimestamp.cxx create mode 100644 Source/cmTimestamp.h create mode 100644 Tests/CMakeTests/File-TIMESTAMP-BadArg1.cmake create mode 100644 Tests/CMakeTests/File-TIMESTAMP-NoFile.cmake create mode 100644 Tests/CMakeTests/File-TIMESTAMP-NotBogus.cmake create mode 100644 Tests/CMakeTests/File-TIMESTAMP-Works.cmake create mode 100644 Tests/CMakeTests/String-TIMESTAMP-AllSpecifiers.cmake create mode 100644 Tests/CMakeTests/String-TIMESTAMP-BadArg1.cmake create mode 100644 Tests/CMakeTests/String-TIMESTAMP-BadArg2.cmake create mode 100644 Tests/CMakeTests/String-TIMESTAMP-BadArg3.cmake create mode 100644 Tests/CMakeTests/String-TIMESTAMP-CustomFormatLocal.cmake create mode 100644 Tests/CMakeTests/String-TIMESTAMP-CustomFormatUTC.cmake create mode 100644 Tests/CMakeTests/String-TIMESTAMP-DefaultFormatLocal.cmake create mode 100644 Tests/CMakeTests/String-TIMESTAMP-DefaultFormatUTC.cmake create mode 100644 Tests/CMakeTests/String-TIMESTAMP-IncompleteSpecifier.cmake create mode 100644 Tests/CMakeTests/String-TIMESTAMP-UnknownSpecifier.cmake hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.10.2-307-g7b20f89
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 7b20f893c28c63a756dfb8a32bf55e964d9b5e8f (commit) via acc224005e99076da3561ada8c06985487b0ce11 (commit) from 28c6d32688388565c4c6af7a60676d7eb41efcfa (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=7b20f893c28c63a756dfb8a32bf55e964d9b5e8f commit 7b20f893c28c63a756dfb8a32bf55e964d9b5e8f Merge: 28c6d32 acc2240 Author: David Cole david.c...@kitware.com AuthorDate: Tue Dec 11 13:44:17 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Dec 11 13:44:17 2012 -0500 Merge topic 'TheRealAutomocIncludeDirFix' acc2240 Automoc: get include dirs without stripping implicit include dirs off --- Summary of changes: Source/cmLocalGenerator.cxx | 27 +++--- Source/cmLocalGenerator.h |3 +- Source/cmQtAutomoc.cxx | 62 ++ 3 files changed, 21 insertions(+), 71 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.10.2-310-gbc9dcad
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 bc9dcadf19d44173bcc0b6cb99eac4cf5fdae4f0 (commit) via f0d938549eead63fb86bec28c299a1bceacbdd6b (commit) via 2bc22bdaacfc0f0f91c229685dc5dbadd0267601 (commit) from 7b20f893c28c63a756dfb8a32bf55e964d9b5e8f (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=bc9dcadf19d44173bcc0b6cb99eac4cf5fdae4f0 commit bc9dcadf19d44173bcc0b6cb99eac4cf5fdae4f0 Merge: 7b20f89 f0d9385 Author: David Cole david.c...@kitware.com AuthorDate: Tue Dec 11 13:44:25 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Dec 11 13:44:25 2012 -0500 Merge topic 'xcode-framework-paths' f0d9385 Makefile: Use modern link information for framework search paths 2bc22bd Xcode: Add frameworks search paths from link dependeny closure (#13397) --- Summary of changes: Source/cmGlobalXCodeGenerator.cxx| 36 ++--- Source/cmMakefileTargetGenerator.cxx | 26 ++-- Source/cmTarget.cxx | 21 --- Source/cmTarget.h|5 4 files changed, 26 insertions(+), 62 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.10.2-312-gd0369a9
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 d0369a980c1e9974edd2f6c74b870ac65163 (commit) via 61ace1df2616e472d056b302e4269cbf112fb020 (commit) from bc9dcadf19d44173bcc0b6cb99eac4cf5fdae4f0 (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=d0369a980c1e9974edd2f6c74b870ac65163 commit d0369a980c1e9974edd2f6c74b870ac65163 Merge: bc9dcad 61ace1d Author: David Cole david.c...@kitware.com AuthorDate: Tue Dec 11 13:44:33 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Dec 11 13:44:33 2012 -0500 Merge topic 'fix-13657-more-gcov47-output' 61ace1d CTest: Coverage handler: expect certain output lines from gcov 4.7 (#13657) --- Summary of changes: Source/CTest/cmCTestCoverageHandler.cxx | 15 +++ 1 files changed, 11 insertions(+), 4 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1272-ge26c1f7
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 e26c1f7fd713e6637e1b487fad601638ef503fb1 (commit) via d0369a980c1e9974edd2f6c74b870ac65163 (commit) via bc9dcadf19d44173bcc0b6cb99eac4cf5fdae4f0 (commit) via 7b20f893c28c63a756dfb8a32bf55e964d9b5e8f (commit) via 28c6d32688388565c4c6af7a60676d7eb41efcfa (commit) via 3d0f1957d1e3178a6977aa840627cd592a2bd46e (commit) via b575eadcdaf55fa4fe9a9d2dd8cb5e530365eae9 (commit) via d73c4057edeca78fcefbcaf9fd3768e2c0e19e07 (commit) via ab2b1f44f88dd82129bcfe7f96007c30e1e07d08 (commit) from d66c8c16790ebf44d1ba339eebfa2ec25cfea287 (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=e26c1f7fd713e6637e1b487fad601638ef503fb1 commit e26c1f7fd713e6637e1b487fad601638ef503fb1 Merge: d66c8c1 d0369a9 Author: David Cole david.c...@kitware.com AuthorDate: Tue Dec 11 13:45:31 2012 -0500 Commit: David Cole david.c...@kitware.com CommitDate: Tue Dec 11 13:45:31 2012 -0500 Merge branch 'master' into next --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1274-ga88b8c7
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 a88b8c7c587923b76896dd68a1cd8a7479ddaa61 (commit) via f24e5388ed3822ede71481f62457f893f80b (commit) from e26c1f7fd713e6637e1b487fad601638ef503fb1 (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=a88b8c7c587923b76896dd68a1cd8a7479ddaa61 commit a88b8c7c587923b76896dd68a1cd8a7479ddaa61 Merge: e26c1f7 f24 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Dec 11 14:02:16 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Dec 11 14:02:16 2012 -0500 Merge topic 'DocumentLIBRARY_PATH' into next f24 Documentation: Clarify handling of implicit link directories http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f24e5388ed3822ede71481f62457f893f80b commit f24e5388ed3822ede71481f62457f893f80b Author: Brad King brad.k...@kitware.com AuthorDate: Tue Dec 11 13:59:15 2012 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Dec 11 13:59:15 2012 -0500 Documentation: Clarify handling of implicit link directories The wording introduced in the parent commit sounds like CMake reads the LIBRARY_PATH environment variable, but it is the toolchain that reads it. diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx index 6b64dc5..32c543d 100644 --- a/Source/cmDocumentVariables.cxx +++ b/Source/cmDocumentVariables.cxx @@ -1621,12 +1621,15 @@ void cmDocumentVariables::DefineVariables(cmake* cm) These paths are implicit linker search directories for the compiler's language. CMake automatically detects these directories for each language and - reports the results in this variable. The content of the environment - variable LIBRARY_PATH during the initial CMake run influences the - contents of the CMAKE_LANG_IMPLICIT_LINK_DIRECTORIES variable. When - linking with the full path against a library located in one of these - directories, only the short form of the link line, e.g. -lFoo, will be - used instead of the full path., false, + reports the results in this variable. + \n + When a library in one of these directories is given by full path to + target_link_libraries() CMake will generate the -lname form on + link lines to ensure the linker searches its implicit directories + for the library. + Note that some toolchains read implicit directories from an + environment variable such as LIBRARY_PATH so keep its value + consistent when operating in a given build tree.,false, Variables for Languages); cm-DefineProperty --- Summary of changes: Source/cmDocumentVariables.cxx | 15 +-- 1 files changed, 9 insertions(+), 6 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1276-g716eed9
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 716eed936f2429ac3218d20608a7e16bc63c2961 (commit) via 017d90c50099540b2bc71b63d646271aa0968d36 (commit) from a88b8c7c587923b76896dd68a1cd8a7479ddaa61 (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=716eed936f2429ac3218d20608a7e16bc63c2961 commit 716eed936f2429ac3218d20608a7e16bc63c2961 Merge: a88b8c7 017d90c Author: Brad King brad.k...@kitware.com AuthorDate: Tue Dec 11 14:02:50 2012 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Dec 11 14:02:50 2012 -0500 Merge topic 'doc-implicit-link-dirs' into next 017d90c Documentation: Clarify handling of implicit link directories http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=017d90c50099540b2bc71b63d646271aa0968d36 commit 017d90c50099540b2bc71b63d646271aa0968d36 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Dec 11 14:00:23 2012 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Dec 11 14:00:23 2012 -0500 Documentation: Clarify handling of implicit link directories Extend documentation for CMAKE_LANG_IMPLICIT_LINK_DIRECTORIES to explain how it is used by CMake and how it can be influenced by environment variables. Inspired-by: Alex Neundorf neund...@kde.org diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx index 55d70f8..32c543d 100644 --- a/Source/cmDocumentVariables.cxx +++ b/Source/cmDocumentVariables.cxx @@ -1621,7 +1621,15 @@ void cmDocumentVariables::DefineVariables(cmake* cm) These paths are implicit linker search directories for the compiler's language. CMake automatically detects these directories for each language and - reports the results in this variable., false, + reports the results in this variable. + \n + When a library in one of these directories is given by full path to + target_link_libraries() CMake will generate the -lname form on + link lines to ensure the linker searches its implicit directories + for the library. + Note that some toolchains read implicit directories from an + environment variable such as LIBRARY_PATH so keep its value + consistent when operating in a given build tree.,false, Variables for Languages); cm-DefineProperty --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1280-g0941fe9
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 0941fe962dedbb5395d336e4c2221df6640f594e (commit)
via cc676c3a08019b17433931a9287d9cd8b0ccf2f2 (commit)
via 2dd67c7ea095957d557d2934a67baacdf8a82d7b (commit)
via ba58d0c06fd8576844a5722930531a95d00c2003 (commit)
from 716eed936f2429ac3218d20608a7e16bc63c2961 (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=0941fe962dedbb5395d336e4c2221df6640f594e
commit 0941fe962dedbb5395d336e4c2221df6640f594e
Merge: 716eed9 cc676c3
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Dec 11 15:44:35 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Dec 11 15:44:35 2012 -0500
Merge topic 'osx-implicit-link-dirs' into next
cc676c3 OS X: Detect implicit linker framework search paths
2dd67c7 OS X: Detect implicit link directories on modern toolchains
ba58d0c OS X: Link with all framework search paths, not just the last
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc676c3a08019b17433931a9287d9cd8b0ccf2f2
commit cc676c3a08019b17433931a9287d9cd8b0ccf2f2
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Dec 5 13:46:04 2012 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Dec 11 15:15:52 2012 -0500
OS X: Detect implicit linker framework search paths
Previously we hard-coded a list of implicit framework directories but
did not account for CMAKE_OSX_SYSROOT or for changes to the list across
OS X versions. Instead we should automatically detect the framework
directories for the active toolchain.
The parent commit added the -Wl,-v option to ask ld to print its
implicit directories. It displays a block such as:
Framework search paths:
/...
Parse this block to extract the list of framework directories.
Detection may fail on toolchains that do not list their framework
directories, such as older OS X linkers. Always treat the paths
sdk/Library/Frameworks
sdk/System/Library/Frameworks
sdk/Network/Library/Frameworks # Older OS X only
/System/Library/Frameworks
as implicit. Note that /System/Library/Frameworks should always be
considered implicit so that frameworks CMake finds there will not
override the SDK copies.
diff --git a/Modules/CMakeCCompiler.cmake.in b/Modules/CMakeCCompiler.cmake.in
index d74dcdc..c41adc9 100644
--- a/Modules/CMakeCCompiler.cmake.in
+++ b/Modules/CMakeCCompiler.cmake.in
@@ -50,6 +50,7 @@ endif()
set(CMAKE_C_IMPLICIT_LINK_LIBRARIES @CMAKE_C_IMPLICIT_LINK_LIBRARIES@)
set(CMAKE_C_IMPLICIT_LINK_DIRECTORIES @CMAKE_C_IMPLICIT_LINK_DIRECTORIES@)
+set(CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES
@CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES@)
@SET_CMAKE_CMCLDEPS_EXECUTABLE@
@SET_CMAKE_CL_SHOWINCLUDE_PREFIX@
diff --git a/Modules/CMakeCXXCompiler.cmake.in
b/Modules/CMakeCXXCompiler.cmake.in
index 8c5d84e..9287b81 100644
--- a/Modules/CMakeCXXCompiler.cmake.in
+++ b/Modules/CMakeCXXCompiler.cmake.in
@@ -51,6 +51,7 @@ endif()
set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES @CMAKE_CXX_IMPLICIT_LINK_LIBRARIES@)
set(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES
@CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES@)
+set(CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES
@CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES@)
@SET_CMAKE_CMCLDEPS_EXECUTABLE@
@SET_CMAKE_CL_SHOWINCLUDE_PREFIX@
diff --git a/Modules/CMakeDetermineCompilerABI.cmake
b/Modules/CMakeDetermineCompilerABI.cmake
index cb94aa6..25d6bbe 100644
--- a/Modules/CMakeDetermineCompilerABI.cmake
+++ b/Modules/CMakeDetermineCompilerABI.cmake
@@ -72,8 +72,9 @@ function(CMAKE_DETERMINE_COMPILER_ABI lang src)
# Parse implicit linker information for this language, if available.
set(implicit_dirs )
set(implicit_libs )
+ set(implicit_fwks )
if(CMAKE_${lang}_VERBOSE_FLAG)
-CMAKE_PARSE_IMPLICIT_LINK_INFO(${OUTPUT} implicit_libs implicit_dirs
log
+CMAKE_PARSE_IMPLICIT_LINK_INFO(${OUTPUT} implicit_libs implicit_dirs
implicit_fwks log
${CMAKE_${lang}_IMPLICIT_OBJECT_REGEX})
file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
Parsed ${lang} implicit link information from above
output:\n${log}\n\n)
@@ -111,6 +112,7 @@ function(CMAKE_DETERMINE_COMPILER_ABI lang src)
set(CMAKE_${lang}_IMPLICIT_LINK_LIBRARIES ${implicit_libs}
PARENT_SCOPE)
set(CMAKE_${lang}_IMPLICIT_LINK_DIRECTORIES ${implicit_dirs}
PARENT_SCOPE)
+ set(CMAKE_${lang}_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES ${implicit_fwks}
PARENT_SCOPE)
