[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-505-g997c8db
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 997c8dbda3cfb297a40d2c99b29344c74fb89d18 (commit)
via 2ed0d06691d5123d92395208338a361b23ec3d62 (commit)
from d851b266b2996058ae7c4da6eec3e0a7c7d86acd (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=997c8dbda3cfb297a40d2c99b29344c74fb89d18
commit 997c8dbda3cfb297a40d2c99b29344c74fb89d18
Merge: d851b26 2ed0d06
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Mar 5 08:33:04 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Mar 5 08:33:04 2014 -0500
Merge topic 'test-AUTOGEN-custom-command-depends' into next
2ed0d066 QtAutogen: Fix AUTOGEN depends on custom command output with VS.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2ed0d06691d5123d92395208338a361b23ec3d62
commit 2ed0d06691d5123d92395208338a361b23ec3d62
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Mar 5 13:43:50 2014 +0100
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Wed Mar 5 14:30:32 2014 +0100
QtAutogen: Fix AUTOGEN depends on custom command output with VS.
Visual Studio is handled as a special case for autogen depends. However,
the special handling works only for target dependencies, not file
dependencies output by a custom command.
Split dependencies into lists of targets and non-targets and handle
the targets only as a special case.
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index dfb310e..31026b6 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -261,20 +261,37 @@ bool
cmQtAutoGenerators::InitializeAutogenTarget(cmTarget* target)
// https://connect.microsoft.com/VisualStudio/feedback/details/769495
usePRE_BUILD = vslg-GetVersion() = cmLocalVisualStudioGenerator::VS7;
}
+ std::vectorstd::string prebuildDeps;
if(usePRE_BUILD)
{
+for (std::vectorstd::string::iterator it = depends.begin();
+ it != depends.end(); )
+ {
+ if(makefile-FindTargetToUse(it-c_str()))
+{
+// The PRE_BUILD handling below can not handle non-targets.
+prebuildDeps.push_back(*it);
+it = depends.erase(it);
+}
+ else
+{
+++it;
+}
+ }
+
// Add the pre-build command directly to bypass the OBJECT_LIBRARY
// rejection in cmMakefile::AddCustomCommandToTarget because we know
// PRE_BUILD will work for an OBJECT_LIBRARY in this specific case.
std::vectorstd::string no_output;
-cmCustomCommand cc(makefile, no_output, depends,
+cmCustomCommand cc(makefile, no_output, prebuildDeps,
commandLines, autogenComment.c_str(),
workingDirectory.c_str());
cc.SetEscapeOldStyle(false);
cc.SetEscapeAllowMakeVars(true);
target-AddPreBuildCommand(cc);
}
- else
+
+ if(!usePRE_BUILD || !depends.empty())
#endif
{
cmTarget* autogenTarget = makefile-AddUtilityCommand(
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 4da125f..0821b45 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -58,11 +58,17 @@ add_custom_target(generate_moc_input
COMMAND ${CMAKE_COMMAND} -E rename
${CMAKE_CURRENT_BINARY_DIR}/myinterface.h.in
${CMAKE_CURRENT_BINARY_DIR}/myinterface.h
)
+add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/myotherinterface.h
+ COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_SOURCE_DIR}/myotherinterface.h.in
${CMAKE_CURRENT_BINARY_DIR}/myotherinterface.h
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/myotherinterface.h.in
+)
+
add_executable(QtAutogen main.cpp calwidget.cpp foo.cpp blub.cpp bar.cpp
abc.cpp
xyz.cpp yaf.cpp gadget.cpp $TARGET_OBJECTS:privateSlot
test.qrc resourcetester.cpp generated.cpp
)
-set_property(TARGET QtAutogen APPEND PROPERTY AUTOGEN_TARGET_DEPENDS
generate_moc_input)
+set_property(TARGET QtAutogen APPEND PROPERTY AUTOGEN_TARGET_DEPENDS
generate_moc_input ${CMAKE_CURRENT_BINARY_DIR}/myotherinterface.h)
set_target_properties(QtAutogen codeeditorLib privateSlot PROPERTIES AUTOMOC
TRUE)
diff --git a/Tests/QtAutogen/generated.h b/Tests/QtAutogen/generated.h
index dd22489..b6c2711 100644
--- a/Tests/QtAutogen/generated.h
+++ b/Tests/QtAutogen/generated.h
@@ -5,11 +5,12 @@
#include QObject
#include myinterface.h
+#include myotherinterface.h
-class Generated : public QObject, MyInterface
+class Generated : public QObject, MyInterface, MyOtherInterface
{
Q_OBJECT
- Q_INTERFACES(MyInterface)
[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-507-g73a8f56
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 73a8f565a56ce4e0738bc0214cfd1d4d7690 (commit)
via 77b035909678fe5ff287f415d0887921f360aacd (commit)
from 997c8dbda3cfb297a40d2c99b29344c74fb89d18 (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=73a8f565a56ce4e0738bc0214cfd1d4d7690
commit 73a8f565a56ce4e0738bc0214cfd1d4d7690
Merge: 997c8db 77b0359
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Mar 5 10:57:00 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Mar 5 10:57:00 2014 -0500
Merge topic 'link-libraries-response-files' into next
77b03590 Windows: Use response files for link libraries only where supported
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=77b035909678fe5ff287f415d0887921f360aacd
commit 77b035909678fe5ff287f415d0887921f360aacd
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Mar 5 10:48:59 2014 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Mar 5 10:49:19 2014 -0500
Windows: Use response files for link libraries only where supported
The NMake Makefiles generator already puts link libraries in an inline
response file and at least the VS = 7.1 tools do not support nested
response files. GNU 3.x compilers do not support response files so we
pass them to the linker using -Wl,@ but link libraries are generated
with options meant for the compiler front-end so passing them through
a response file to the linker does not always work.
diff --git a/Help/release/dev/link-libraries-response-files.rst
b/Help/release/dev/link-libraries-response-files.rst
index 624abf5..cecf7f6 100644
--- a/Help/release/dev/link-libraries-response-files.rst
+++ b/Help/release/dev/link-libraries-response-files.rst
@@ -1,9 +1,5 @@
link-libraries-response-files
-
-* The Makefile generators learned to use response files with
- GNU tools on Windows to pass the list of link directories
- and libraries when linking executables and shared libraries.
- This matches the approach already used for passing include
- directories to the compiler and object files to the linker
- or archiver. It allows very long lists of libraries.
+* The Makefile generators learned to use response files with GNU tools
+ on Windows to pass library directories and names to the linker.
diff --git a/Modules/Platform/Windows-GNU.cmake
b/Modules/Platform/Windows-GNU.cmake
index 2bb7a20..5c5b360 100644
--- a/Modules/Platform/Windows-GNU.cmake
+++ b/Modules/Platform/Windows-GNU.cmake
@@ -87,6 +87,7 @@ macro(__windows_compiler_gnu lang)
set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS )
set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_OBJECTS ${__WINDOWS_GNU_LD_RESPONSE})
+ set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_LIBRARIES
${__WINDOWS_GNU_LD_RESPONSE})
set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_INCLUDES 1)
# We prefer @ for response files but it is not supported by gcc 3.
@@ -103,7 +104,9 @@ macro(__windows_compiler_gnu lang)
endif()
# The GNU 3.x compilers do not support response files (only linkers).
set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_INCLUDES 0)
- elseif(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_OBJECTS)
+# Link libraries are generated only for the front-end.
+set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_LIBRARIES 0)
+ else()
# Use @ to pass the response file to the front-end.
set(CMAKE_${lang}_RESPONSE_FILE_LINK_FLAG @)
endif()
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx
b/Source/cmMakefileExecutableTargetGenerator.cxx
index 4bca752..1802054 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -307,14 +307,26 @@ void
cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
}
// Select whether to use a response file for objects.
- bool useResponseFile = false;
+ bool useResponseFileForObjects = false;
{
std::string responseVar = CMAKE_;
responseVar += linkLanguage;
responseVar += _USE_RESPONSE_FILE_FOR_OBJECTS;
if(this-Makefile-IsOn(responseVar.c_str()))
{
-useResponseFile = true;
+useResponseFileForObjects = true;
+}
+ }
+
+ // Select whether to use a response file for libraries.
+ bool useResponseFileForLibs = false;
+ {
+ std::string responseVar = CMAKE_;
+ responseVar += linkLanguage;
+ responseVar += _USE_RESPONSE_FILE_FOR_LIBRARIES;
+ if(this-Makefile-IsOn(responseVar.c_str()))
+{
+useResponseFileForLibs = true;
}
}
@@ -325,13 +337,13 @@ void
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc1-132-ga8dced5
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 a8dced5856c4dc6c2e00ee49c5ba1bc981688cef (commit) via 3504f9b9ff8d76739f39af2bd2de8b6068431c2e (commit) from c9df12cceed9fdf946503ea47abb113ebaa9800e (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=a8dced5856c4dc6c2e00ee49c5ba1bc981688cef commit a8dced5856c4dc6c2e00ee49c5ba1bc981688cef Merge: c9df12c 3504f9b Author: Brad King brad.k...@kitware.com AuthorDate: Wed Mar 5 11:08:02 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Mar 5 11:08:02 2014 -0500 Merge topic 'fix-check-build-system-crash' 3504f9b9 cmake: Fix --check-build-system argument count check (#14784) --- Summary of changes: Source/cmake.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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. v3.0.0-rc1-128-gcefa802
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 cefa80236d01635cccebf9aa69f58f0f40cfede3 (commit) via 9608ef6f402bc5730dbf3276abf27b4e4b1abb2b (commit) via 9f5bd180c8e0114ff153deeaa1690ce9eb250005 (commit) via 76477267bda58d10b8e00229bffd841f9e73d041 (commit) via a8a9fb7edd2e3631388c9e18e4700cbb12207be8 (commit) via 4047557379c34223f2e27a626e1a06e6702329f4 (commit) via f99734b2da43af21b9c023d117eb3d0daba9b30e (commit) via 3c01ee5adceafb0febd9cedab9211f830f953c03 (commit) via daf0a5fedebb2dac66ac26516eeeff502ddcf432 (commit) via e5096312378f97cca24f4190082b3b8991812608 (commit) from 9e6e9140c2baf2afa546fbb3a72fbff31e81f69c (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=cefa80236d01635cccebf9aa69f58f0f40cfede3 commit cefa80236d01635cccebf9aa69f58f0f40cfede3 Merge: 9e6e914 9608ef6 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Mar 5 11:07:59 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Mar 5 11:07:59 2014 -0500 Merge topic 'test-external-cmake' 9608ef6f Tests: Optionally configure tests exclusively, with an external CMake 9f5bd180 Tests: Drop CMAKE_TEST_GENERATOR(|_TOOLSET) variables 76477267 Tests: Drop CMAKE_TEST_MAKEPROGRAM variable a8a9fb7e Tests: Rename CMAKE_TEST_MAKEPROGRAM uses for explicit make program 40475573 Tests: Rename CMAKE_TEST_MAKEPROGRAM uses for nested test projects f99734b2 Tests: Rename CMAKE_TEST_DEVENV - CMake_TEST_DEVENV 3c01ee5a Tests: Drop CMAKE_TEST_MSVC and test MSVC directly daf0a5fe Tests: Drop CMAKE_TEST_GENERATOR and CMAKE_TEST_MAKEPROGRAM options e5096312 Tests: Drop kwsys test --- Summary of changes: CMakeLists.txt | 329 ++-- Tests/CMakeBuildTest.cmake.in |4 +- Tests/CMakeLists.txt | 192 ++-- Tests/CMakeOnly/Test.cmake.in |4 +- .../CTestBuildCommandProjectInSubdir.cmake.in |2 +- Tests/CTestConfig/dashboard.cmake.in |4 +- Tests/CTestConfig/script.cmake.in |4 +- Tests/CTestTestBadExe/test.cmake.in|4 +- Tests/CTestTestChecksum/test.cmake.in |4 +- Tests/CTestTestConfigFileInBuildDir/test1.cmake.in |4 +- Tests/CTestTestConfigFileInBuildDir/test2.cmake.in |4 +- Tests/CTestTestCostSerial/test.cmake.in|4 +- Tests/CTestTestCrash/test.cmake.in |4 +- Tests/CTestTestCycle/test.cmake.in |4 +- Tests/CTestTestDepends/test.cmake.in |4 +- Tests/CTestTestFailure/testNoBuild.cmake.in|4 +- Tests/CTestTestFailure/testNoExe.cmake.in |4 +- Tests/CTestTestFdSetSize/test.cmake.in |4 +- Tests/CTestTestMemcheck/test.cmake.in |4 +- Tests/CTestTestParallel/test.cmake.in |4 +- Tests/CTestTestResourceLock/test.cmake.in |4 +- Tests/CTestTestScheduler/test.cmake.in |4 +- Tests/CTestTestSkipReturnCode/test.cmake.in|4 +- Tests/CTestTestStopTime/test.cmake.in |4 +- Tests/CTestTestSubdir/test.cmake.in|4 +- Tests/CTestTestTimeout/test.cmake.in |4 +- Tests/CTestTestUpload/test.cmake.in|4 +- Tests/CTestTestZeroTimeout/test.cmake.in |4 +- Tests/ExportImport/CMakeLists.txt |4 +- Tests/ExportImport/InitialCache.cmake.in |2 +- .../ExternalProjectUpdateTest.cmake|2 +- Tests/Fortran/CMakeLists.txt |6 +- Tests/FortranC/Flags.cmake.in |4 +- Tests/MacRuntimePath/CMakeLists.txt|4 +- Tests/MacRuntimePath/InitialCache.cmake.in |2 +- Tests/RunCMake/CMakeLists.txt |8 +- 36 files changed, 329 insertions(+), 326 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. v3.0.0-rc1-116-g955dd1a
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 955dd1a551698aa85b404bcd96b62740caac3160 (commit) via 69d73d27cba5249e3cfe1ba12ccdfbc3b5962e8b (commit) from f0dcbb17721e777bef3be6b2f4011fefaa6fbbf0 (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=955dd1a551698aa85b404bcd96b62740caac3160 commit 955dd1a551698aa85b404bcd96b62740caac3160 Merge: f0dcbb1 69d73d2 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Mar 5 11:07:57 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Mar 5 11:07:57 2014 -0500 Merge topic 'doc-find_package-build-paths' 69d73d27 Help: Mention in find_package that cmake-gui step is Windows-only (#14781) --- Summary of changes: Help/command/find_package.rst |1 + 1 file changed, 1 insertion(+) 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. v3.0.0-rc1-118-g9e6e914
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 9e6e9140c2baf2afa546fbb3a72fbff31e81f69c (commit) via 7e187eeacd609c18940aa7cd700b048f72fd5568 (commit) from 955dd1a551698aa85b404bcd96b62740caac3160 (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=9e6e9140c2baf2afa546fbb3a72fbff31e81f69c commit 9e6e9140c2baf2afa546fbb3a72fbff31e81f69c Merge: 955dd1a 7e187ee Author: Brad King brad.k...@kitware.com AuthorDate: Wed Mar 5 11:07:58 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Mar 5 11:07:58 2014 -0500 Merge topic 'fix-CMP0017-check' 7e187eea CMP0017: Fix check when including from CMake source tree --- Summary of changes: Source/cmMakefile.cxx|3 ++- Tests/FindPackageTest/FindLotsOfComponents.cmake |2 +- Tests/FindPackageTest/FindSomePackage.cmake |2 +- Tests/FindPackageTest/FindUpperCasePackage.cmake |2 +- 4 files changed, 5 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, master, updated. v3.0.0-rc1-114-gf0dcbb1
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 f0dcbb17721e777bef3be6b2f4011fefaa6fbbf0 (commit)
via 8372b4553bc58c00ad3ef923919ff5547746b95e (commit)
via d348cd1bc50b74786d3e350a3b29aa92eeca1339 (commit)
from ea95e3eae32b35711e23de30b4cbdb5ad2bd930a (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=f0dcbb17721e777bef3be6b2f4011fefaa6fbbf0
commit f0dcbb17721e777bef3be6b2f4011fefaa6fbbf0
Merge: ea95e3e 8372b45
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Mar 5 11:07:55 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Mar 5 11:07:55 2014 -0500
Merge topic 'FeatureSummary_combine_WHAT_values'
8372b455 FeatureSummary: Add unit tests
d348cd1b FeatureSummary: Allow to combine and reorder values for the WHAT
option
---
Summary of changes:
Modules/FeatureSummary.cmake | 56 ++--
Tests/RunCMake/CMakeLists.txt |1 +
.../{CMP0022 = FeatureSummary}/CMakeLists.txt |0
.../FeatureSummaryWhatAll-stdout.txt |7 +++
.../FeatureSummary/FeatureSummaryWhatAll.cmake |9
.../FeatureSummaryWhatList-stdout.txt |7 +++
.../FeatureSummary/FeatureSummaryWhatList.cmake|9
.../FeatureSummaryWhatListAll-result.txt} |0
.../FeatureSummaryWhatListAll-stderr.txt |6 +++
.../FeatureSummary/FeatureSummaryWhatListAll.cmake |9
.../FeatureSummaryWhatListUnknown-result.txt} |0
.../FeatureSummaryWhatListUnknown-stderr.txt |6 +++
.../FeatureSummaryWhatListUnknown.cmake|9
.../FeatureSummaryWhatSingle-stdout.txt|1 +
.../FeatureSummary/FeatureSummaryWhatSingle.cmake |9
.../FeatureSummaryWhatSingleUnknown-result.txt}|0
.../FeatureSummaryWhatSingleUnknown-stderr.txt |6 +++
.../FeatureSummaryWhatSingleUnknown.cmake |9
Tests/RunCMake/FeatureSummary/RunCMakeTest.cmake |8 +++
19 files changed, 135 insertions(+), 17 deletions(-)
copy Tests/RunCMake/{CMP0022 = FeatureSummary}/CMakeLists.txt (100%)
create mode 100644
Tests/RunCMake/FeatureSummary/FeatureSummaryWhatAll-stdout.txt
create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryWhatAll.cmake
create mode 100644
Tests/RunCMake/FeatureSummary/FeatureSummaryWhatList-stdout.txt
create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryWhatList.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =
FeatureSummary/FeatureSummaryWhatListAll-result.txt} (100%)
create mode 100644
Tests/RunCMake/FeatureSummary/FeatureSummaryWhatListAll-stderr.txt
create mode 100644
Tests/RunCMake/FeatureSummary/FeatureSummaryWhatListAll.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =
FeatureSummary/FeatureSummaryWhatListUnknown-result.txt} (100%)
create mode 100644
Tests/RunCMake/FeatureSummary/FeatureSummaryWhatListUnknown-stderr.txt
create mode 100644
Tests/RunCMake/FeatureSummary/FeatureSummaryWhatListUnknown.cmake
create mode 100644
Tests/RunCMake/FeatureSummary/FeatureSummaryWhatSingle-stdout.txt
create mode 100644 Tests/RunCMake/FeatureSummary/FeatureSummaryWhatSingle.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =
FeatureSummary/FeatureSummaryWhatSingleUnknown-result.txt} (100%)
create mode 100644
Tests/RunCMake/FeatureSummary/FeatureSummaryWhatSingleUnknown-stderr.txt
create mode 100644
Tests/RunCMake/FeatureSummary/FeatureSummaryWhatSingleUnknown.cmake
create mode 100644 Tests/RunCMake/FeatureSummary/RunCMakeTest.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. v3.0.0-rc1-137-gc03f42e
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 c03f42ef326eb3794e7bf095b69709d095febc6a (commit) via b052902c32190f6c10c703ab07310a91fa50d46a (commit) from 30464fda2cc2317a5f9b5b66d5f1fabfd4017dfe (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=c03f42ef326eb3794e7bf095b69709d095febc6a commit c03f42ef326eb3794e7bf095b69709d095febc6a Merge: 30464fd b052902 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Mar 5 11:08:05 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Mar 5 11:08:05 2014 -0500 Merge topic 'watcom-rtdll-version' b052902c Remove hard-coded version of RTDLL for Open Watcom --- Summary of changes: Modules/InstallRequiredSystemLibraries.cmake | 24 ++-- 1 file changed, 14 insertions(+), 10 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. v3.0.0-rc1-517-g4a97290
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 4a97290da013dfd7c57db4f6dec90976fa3a5064 (commit) via c03f42ef326eb3794e7bf095b69709d095febc6a (commit) via 30464fda2cc2317a5f9b5b66d5f1fabfd4017dfe (commit) via a8dced5856c4dc6c2e00ee49c5ba1bc981688cef (commit) via c9df12cceed9fdf946503ea47abb113ebaa9800e (commit) via cefa80236d01635cccebf9aa69f58f0f40cfede3 (commit) via 9e6e9140c2baf2afa546fbb3a72fbff31e81f69c (commit) via 955dd1a551698aa85b404bcd96b62740caac3160 (commit) via f0dcbb17721e777bef3be6b2f4011fefaa6fbbf0 (commit) via ea95e3eae32b35711e23de30b4cbdb5ad2bd930a (commit) from 73a8f565a56ce4e0738bc0214cfd1d4d7690 (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=4a97290da013dfd7c57db4f6dec90976fa3a5064 commit 4a97290da013dfd7c57db4f6dec90976fa3a5064 Merge: 73a8f56 c03f42e Author: Brad King brad.k...@kitware.com AuthorDate: Wed Mar 5 11:09:48 2014 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Wed Mar 5 11:09:48 2014 -0500 Merge branch 'master' into next --- 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 http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.0.0-rc1-135-g30464fd
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 30464fda2cc2317a5f9b5b66d5f1fabfd4017dfe (commit) via 7db95df39d8c191f3de92f4d60a0e4106700dda5 (commit) via f096786d5428505f8313f6b01f4631f5a34b27a2 (commit) from a8dced5856c4dc6c2e00ee49c5ba1bc981688cef (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=30464fda2cc2317a5f9b5b66d5f1fabfd4017dfe commit 30464fda2cc2317a5f9b5b66d5f1fabfd4017dfe Merge: a8dced5 7db95df Author: Brad King brad.k...@kitware.com AuthorDate: Wed Mar 5 11:08:04 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Mar 5 11:08:04 2014 -0500 Merge topic 'update-kwsys' 7db95df3 Merge branch 'upstream-kwsys' into update-kwsys f096786d KWSys 2014-03-03 (b1916e0a) --- Summary of changes: Source/kwsys/CMakeLists.txt|6 ++ Source/kwsys/FStream.cxx | 76 +++ Source/kwsys/FStream.hxx.in| 21 +- Source/kwsys/SharedForward.h.in|8 +- Source/kwsys/SystemInformation.cxx | 21 +- Source/kwsys/SystemTools.cxx |3 + Source/kwsys/testFStream.cxx | 142 7 files changed, 268 insertions(+), 9 deletions(-) create mode 100644 Source/kwsys/FStream.cxx 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. v3.0.0-rc1-519-gd880854
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 d8808544f282ba320c32d941ad3859127cdae5ae (commit) via 4da09d1a3f1541f075ce9614b9b7bd0cabbd800c (commit) from 4a97290da013dfd7c57db4f6dec90976fa3a5064 (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=d8808544f282ba320c32d941ad3859127cdae5ae commit d8808544f282ba320c32d941ad3859127cdae5ae Merge: 4a97290 4da09d1 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Mar 5 11:21:06 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Mar 5 11:21:06 2014 -0500 Merge topic 'FeatureSummary_combine_WHAT_values' into next 4da09d1a Help: Add release notes for topic 'FeatureSummary_combine_WHAT_values' http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4da09d1a3f1541f075ce9614b9b7bd0cabbd800c commit 4da09d1a3f1541f075ce9614b9b7bd0cabbd800c Author: Brad King brad.k...@kitware.com AuthorDate: Wed Mar 5 11:20:28 2014 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Wed Mar 5 11:20:28 2014 -0500 Help: Add release notes for topic 'FeatureSummary_combine_WHAT_values' diff --git a/Help/release/dev/FeatureSummary_combine_WHAT_values.rst b/Help/release/dev/FeatureSummary_combine_WHAT_values.rst new file mode 100644 index 000..174ef15 --- /dev/null +++ b/Help/release/dev/FeatureSummary_combine_WHAT_values.rst @@ -0,0 +1,6 @@ +FeatureSummary_combine_WHAT_values +-- + +* The :module:`FeatureSummary` module ``feature_summary`` API + learned to accept multiple values for the ``WHAT`` option and + combine them appropriately. --- Summary of changes: Help/release/dev/FeatureSummary_combine_WHAT_values.rst |6 ++ 1 file changed, 6 insertions(+) create mode 100644 Help/release/dev/FeatureSummary_combine_WHAT_values.rst 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. v3.0.0-rc1-521-g26802fe
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 26802fe7ed853606a8292b1983ee9bb0726f8a48 (commit)
via bf28ff1f422407f10ecc283f03ce8c5ee57f1812 (commit)
from d8808544f282ba320c32d941ad3859127cdae5ae (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=26802fe7ed853606a8292b1983ee9bb0726f8a48
commit 26802fe7ed853606a8292b1983ee9bb0726f8a48
Merge: d880854 bf28ff1
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Mar 5 12:01:16 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Mar 5 12:01:16 2014 -0500
Merge topic 'different-python-header-libs-exe-0013794' into next
bf28ff1f FindPythonLibs: Do not try to find the interpreter (#13794)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf28ff1f422407f10ecc283f03ce8c5ee57f1812
commit bf28ff1f422407f10ecc283f03ce8c5ee57f1812
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Mar 5 11:57:00 2014 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Mar 5 11:58:13 2014 -0500
FindPythonLibs: Do not try to find the interpreter (#13794)
The parent commit taught FindPythonLibs to try to find PythonInterp
unconditionally. Some projects may want the libraries of a specific
version even when the corresponding interpreter is not available. Drop
the internal use of FindPythonInterp and just use the versions from it
if it happens to have been found by the project first. That will allow
projects to get a consistent version when they want both but not
otherwise force them to find the interpreter.
diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
index 27d9e45..656ed7b 100644
--- a/Modules/FindPythonLibs.cmake
+++ b/Modules/FindPythonLibs.cmake
@@ -83,7 +83,6 @@ endif()
# If FindPythonInterp has already found the major and minor version,
# insert that version between the user supplied versions and the stock
# version list.
-find_package(PythonInterp QUIET)
set(_Python_VERSIONS ${Python_ADDITIONAL_VERSIONS})
if(DEFINED PYTHON_VERSION_MAJOR AND DEFINED PYTHON_VERSION_MINOR)
list(APPEND _Python_VERSIONS ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
---
Summary of changes:
Modules/FindPythonLibs.cmake |1 -
1 file changed, 1 deletion(-)
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. v3.0.0-rc1-139-g4d67891
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 4d67891a73bb523a021cc420f457b507c4dcb1d0 (commit) via 4da09d1a3f1541f075ce9614b9b7bd0cabbd800c (commit) from c03f42ef326eb3794e7bf095b69709d095febc6a (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=4d67891a73bb523a021cc420f457b507c4dcb1d0 commit 4d67891a73bb523a021cc420f457b507c4dcb1d0 Merge: c03f42e 4da09d1 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Mar 5 13:04:49 2014 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Wed Mar 5 13:04:49 2014 -0500 Merge topic 'FeatureSummary_combine_WHAT_values' 4da09d1a Help: Add release notes for topic 'FeatureSummary_combine_WHAT_values' --- Summary of changes: Help/release/dev/FeatureSummary_combine_WHAT_values.rst |6 ++ 1 file changed, 6 insertions(+) create mode 100644 Help/release/dev/FeatureSummary_combine_WHAT_values.rst 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. v3.0.0-rc1-523-g1405ef8
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 1405ef800f1f07673b647c0fa46320076ce95fde (commit) via 4d67891a73bb523a021cc420f457b507c4dcb1d0 (commit) from 26802fe7ed853606a8292b1983ee9bb0726f8a48 (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=1405ef800f1f07673b647c0fa46320076ce95fde commit 1405ef800f1f07673b647c0fa46320076ce95fde Merge: 26802fe 4d67891 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Mar 5 13:05:38 2014 -0500 Commit: Brad King brad.k...@kitware.com CommitDate: Wed Mar 5 13:05:38 2014 -0500 Merge branch 'master' into next --- 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. v3.0.0-rc1-525-gdca36fa
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 dca36fada79b68ecc0eb9cb7d8b9fa269e92ff38 (commit)
via 3b579421ce1709c2599f801e8e8a4e54fc0ad24d (commit)
from 1405ef800f1f07673b647c0fa46320076ce95fde (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=dca36fada79b68ecc0eb9cb7d8b9fa269e92ff38
commit dca36fada79b68ecc0eb9cb7d8b9fa269e92ff38
Merge: 1405ef8 3b57942
Author: Matt McCormick matt.mccorm...@kitware.com
AuthorDate: Wed Mar 5 17:44:26 2014 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Mar 5 17:44:26 2014 -0500
Merge topic 'python-3.4' into next
3b579421 FindPython{Interp,Libs}: Search for Python 3.4.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b579421ce1709c2599f801e8e8a4e54fc0ad24d
commit 3b579421ce1709c2599f801e8e8a4e54fc0ad24d
Author: Matt McCormick matt.mccorm...@kitware.com
AuthorDate: Wed Mar 5 17:41:47 2014 -0500
Commit: Matt McCormick matt.mccorm...@kitware.com
CommitDate: Wed Mar 5 17:41:47 2014 -0500
FindPython{Interp,Libs}: Search for Python 3.4.
Python 3.4.0rnc1 was released on 2014-02-20.
diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
index 8da848c..e23a58b 100644
--- a/Modules/FindPythonInterp.cmake
+++ b/Modules/FindPythonInterp.cmake
@@ -47,7 +47,7 @@ unset(_Python_NAMES)
set(_PYTHON1_VERSIONS 1.6 1.5)
set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
-set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0)
+set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
if(PythonInterp_FIND_VERSION)
if(PythonInterp_FIND_VERSION_COUNT GREATER 1)
diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
index 27d9e45..a366372 100644
--- a/Modules/FindPythonLibs.cmake
+++ b/Modules/FindPythonLibs.cmake
@@ -51,7 +51,7 @@ CMAKE_FIND_FRAMEWORKS(Python)
set(_PYTHON1_VERSIONS 1.6 1.5)
set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
-set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0)
+set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
if(PythonLibs_FIND_VERSION)
if(PythonLibs_FIND_VERSION_COUNT GREATER 1)
---
Summary of changes:
Modules/FindPythonInterp.cmake |2 +-
Modules/FindPythonLibs.cmake |2 +-
2 files changed, 2 insertions(+), 2 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. v3.0.0-rc1-140-g70da6f1
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 70da6f198f8def8201c562365b914c700b10b95b (commit) from 4d67891a73bb523a021cc420f457b507c4dcb1d0 (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=70da6f198f8def8201c562365b914c700b10b95b commit 70da6f198f8def8201c562365b914c700b10b95b Author: Kitware Robot kwro...@kitware.com AuthorDate: Thu Mar 6 00:01:05 2014 -0500 Commit: Kitware Robot kwro...@kitware.com CommitDate: Thu Mar 6 00:01:05 2014 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 66c8761..8fdad13 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 0) -set(CMake_VERSION_PATCH 20140305) +set(CMake_VERSION_PATCH 20140306) #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 http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
