[Cmake-commits] CMake branch, next, updated. v3.3.0-1997-g6d0cf23
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 6d0cf23c5d225f629bfc076eac4340cfac28e597 (commit)
via 94226751cb9beb7aa1939e9395d4999e30b30600 (commit)
via 105011e08fafe23cb4cfd4fcb1468187f9d81f21 (commit)
via d882d4770fec6d65d82d818b4979cb5763d253c1 (commit)
via 145735b748ab04505ab7a885a54fbd175ccecee2 (commit)
from 662af68dd367056396d8c48f9854137ff05f45ba (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=6d0cf23c5d225f629bfc076eac4340cfac28e597
commit 6d0cf23c5d225f629bfc076eac4340cfac28e597
Merge: 662af68 9422675
Author: Brad King
AuthorDate: Thu Aug 6 09:34:19 2015 -0400
Commit: CMake Topic Stage
CommitDate: Thu Aug 6 09:34:19 2015 -0400
Merge topic 'cpack-rpm-documentation-fixes' into next
94226751 Tests/RunCMake/CPack: Add dependencies tests
105011e0 Tests/RunCMake/CPack: Bump verify result cmake version
d882d477 Tests/RunCMake/CPack/DEB: Add getPackageInfo helper function
145735b7 Tests/RunCMake/CPack: Enable CXX language in tests
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=94226751cb9beb7aa1939e9395d4999e30b30600
commit 94226751cb9beb7aa1939e9395d4999e30b30600
Author: Domen Vrankar
AuthorDate: Wed Jul 29 23:39:11 2015 +0200
Commit: Brad King
CommitDate: Thu Aug 6 09:33:51 2015 -0400
Tests/RunCMake/CPack: Add dependencies tests
Add tests for RPM and DEB package test for currently supported
dependency features (requires, provides, conflicts, ...).
diff --git a/Tests/RunCMake/CPack/DEB/DEPENDENCIES-ExpectedFiles.cmake
b/Tests/RunCMake/CPack/DEB/DEPENDENCIES-ExpectedFiles.cmake
new file mode 100644
index 000..c56c670
--- /dev/null
+++ b/Tests/RunCMake/CPack/DEB/DEPENDENCIES-ExpectedFiles.cmake
@@ -0,0 +1,14 @@
+set(whitespaces_ "[\t\n\r ]*")
+
+set(EXPECTED_FILES_COUNT "5")
+set(EXPECTED_FILE_1 "dependencies*-applications.deb")
+set(EXPECTED_FILE_CONTENT_1 "^.*/usr/foo${whitespaces_}.*/usr/foo/test_prog$")
+set(EXPECTED_FILE_2 "dependencies*-applications_auto.deb")
+set(EXPECTED_FILE_CONTENT_2
"^.*/usr/foo_auto${whitespaces_}.*/usr/foo_auto/test_prog$")
+set(EXPECTED_FILE_3 "dependencies*-headers.deb")
+set(EXPECTED_FILE_CONTENT_3
"^.*/usr/bar${whitespaces_}.*/usr/bar/CMakeLists.txt$")
+set(EXPECTED_FILE_4 "dependencies*-libs.deb")
+# dynamic lib extension is .so on Linux and .dylib on Mac so we will use a
wildcard .* for it
+set(EXPECTED_FILE_CONTENT_4
"^.*/usr/bas${whitespaces_}.*/usr/bas/libtest_lib\\..*$")
+set(EXPECTED_FILE_5 "dependencies*-libs_auto.deb")
+set(EXPECTED_FILE_CONTENT_5
"^.*/usr/bas_auto${whitespaces_}.*/usr/bas_auto/libtest_lib\\..*$")
diff --git a/Tests/RunCMake/CPack/DEB/DEPENDENCIES-VerifyResult.cmake
b/Tests/RunCMake/CPack/DEB/DEPENDENCIES-VerifyResult.cmake
new file mode 100644
index 000..44c862d
--- /dev/null
+++ b/Tests/RunCMake/CPack/DEB/DEPENDENCIES-VerifyResult.cmake
@@ -0,0 +1,15 @@
+function(checkDepends_ FILE REGEX)
+ set(whitespaces_ "[\t\n\r ]*")
+
+ getPackageInfo("${FILE}" "FILE_INFO_")
+ if(NOT FILE_INFO_ MATCHES "${REGEX}")
+message(FATAL_ERROR "Unexpected dependencies in '${FILE}'; file info:
'${FILE_INFO_}'")
+ endif()
+endfunction()
+
+checkDepends_("${FOUND_FILE_1}"
".*Depends${whitespaces_}:${whitespaces_}depend-application,
depend-application-b.*")
+# use wildcard as we are using dependency auto detection
+checkDepends_("${FOUND_FILE_2}"
".*Depends${whitespaces_}:${whitespaces_}.*depend-application,
depend-application-b.*")
+checkDepends_("${FOUND_FILE_3}"
".*Depends${whitespaces_}:${whitespaces_}depend-headers.*")
+checkDepends_("${FOUND_FILE_4}"
".*Depends${whitespaces_}:${whitespaces_}depend-default, depend-default-b.*")
+checkDepends_("${FOUND_FILE_5}"
".*Depends${whitespaces_}:${whitespaces_}depend-default, depend-default-b.*")
diff --git a/Tests/RunCMake/CPack/DEB/DEPENDENCIES-specifics.cmake
b/Tests/RunCMake/CPack/DEB/DEPENDENCIES-specifics.cmake
new file mode 100644
index 000..9e09428
--- /dev/null
+++ b/Tests/RunCMake/CPack/DEB/DEPENDENCIES-specifics.cmake
@@ -0,0 +1,15 @@
+set(CPACK_PACKAGE_CONTACT "someone")
+set(CPACK_DEB_COMPONENT_INSTALL "ON")
+
+# false by default
+set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS FALSE)
+# FIXME can not be tested as libraries first have to be part of a package in
order
+# to determine their dependencies and we can not be certain if there will be
any
+set(CPACK_DEBIAN_APPLICATIONS_AUTO_PACKAGE_SHLIBDEPS TRUE)
+
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "depend-default, depend-default-b")
+set(CPACK_DEBIAN_APPLICATIONS_PACKAGE_DEPENDS "depend-application,
depend-application-b")
+set(CPAC
[Cmake-commits] CMake branch, master, updated. v3.3.0-751-g78141e7
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 78141e799cac1f25e9d21e487ccaea3381a3715d (commit) via 26f5445bb461910efd42bc80a99a63dd53b49643 (commit) from 55706506c7bd84ded84a85042ac8bd72f4506411 (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=78141e799cac1f25e9d21e487ccaea3381a3715d commit 78141e799cac1f25e9d21e487ccaea3381a3715d Merge: 5570650 26f5445 Author: Brad King AuthorDate: Thu Aug 6 09:38:29 2015 -0400 Commit: CMake Topic Stage CommitDate: Thu Aug 6 09:38:29 2015 -0400 Merge topic 'install-no-runtime-deps-by-default' 26f5445b Do not install 3rd-party dependencies by default --- Summary of changes: CMakeLists.txt |2 +- Utilities/Release/dash2win64_cygwin.cmake|1 + Utilities/Release/dash2win64_release.cmake |1 + Utilities/Release/dashmacmini2_release.cmake |1 + Utilities/Release/dashmacmini5_release.cmake |1 + Utilities/Release/linux64_release.cmake |1 + Utilities/Release/magrathea_release.cmake|1 + 7 files changed, 7 insertions(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.3.0-702-g370e2c6
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 370e2c6785ce9167c9945763505353816780326c (commit) via 12c3f24827d2459154fcc9773b279f96c303e591 (commit) via 6c0e9ee276e9e35a970990baec09c0c2c85b3804 (commit) from 4f0a6d462e1c22d7c681aac5dd77ce73a560f9f2 (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=370e2c6785ce9167c9945763505353816780326c commit 370e2c6785ce9167c9945763505353816780326c Merge: 4f0a6d4 12c3f24 Author: Brad King AuthorDate: Thu Aug 6 09:38:22 2015 -0400 Commit: CMake Topic Stage CommitDate: Thu Aug 6 09:38:22 2015 -0400 Merge topic 'refactor-evaluation-files' 12c3f248 cmGeneratorExpressionEvaluationFile: Require generator context. 6c0e9ee2 cmMakefile: Store EvaluationFiles. --- Summary of changes: Source/cmFileCommand.cxx |7 +-- Source/cmGeneratorExpressionEvaluationFile.cxx | 40 + Source/cmGeneratorExpressionEvaluationFile.h | 15 --- Source/cmGlobalGenerator.cxx | 56 +++- Source/cmGlobalGenerator.h |8 Source/cmGlobalNinjaGenerator.cxx | 26 +-- Source/cmLocalGenerator.cxx| 48 Source/cmLocalGenerator.h |2 + Source/cmMakefile.cxx | 21 + Source/cmMakefile.h|9 10 files changed, 129 insertions(+), 103 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.3.0-699-g4f0a6d4
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 4f0a6d462e1c22d7c681aac5dd77ce73a560f9f2 (commit) via f0609182cc2bbce7f6af557d6352e0c434e7acc2 (commit) from d356bced9b362be1396c91854e0684da6ec6f507 (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=4f0a6d462e1c22d7c681aac5dd77ce73a560f9f2 commit 4f0a6d462e1c22d7c681aac5dd77ce73a560f9f2 Merge: d356bce f060918 Author: Brad King AuthorDate: Thu Aug 6 09:38:20 2015 -0400 Commit: CMake Topic Stage CommitDate: Thu Aug 6 09:38:20 2015 -0400 Merge topic 'compiler-version-Fortran' f0609182 Fortran: Store detected compiler version persistently (#15684) --- Summary of changes: Modules/CMakeFortranCompiler.cmake.in |1 + 1 file changed, 1 insertion(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.3.0-697-gd356bce
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 d356bced9b362be1396c91854e0684da6ec6f507 (commit)
via c4d2f64f3c9dea3a5fcd8af5bb389db00ccd64df (commit)
from 42526efec45993466cbc605eb2cee70194eed4a6 (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=d356bced9b362be1396c91854e0684da6ec6f507
commit d356bced9b362be1396c91854e0684da6ec6f507
Merge: 42526ef c4d2f64
Author: Brad King
AuthorDate: Thu Aug 6 09:38:17 2015 -0400
Commit: CMake Topic Stage
CommitDate: Thu Aug 6 09:38:17 2015 -0400
Merge topic 'fix-missing-subdir-error'
c4d2f64f add_subdirectory: Fix error message on missing CMakeLists.txt
(#15680)
---
Summary of changes:
Source/cmMakefile.cxx |4 ++--
Tests/RunCMake/CMakeLists.txt |1 +
.../{AutoExportDll => add_subdirectory}/CMakeLists.txt |0
.../DoesNotExist-result.txt} |0
Tests/RunCMake/add_subdirectory/DoesNotExist-stderr.txt|5 +
Tests/RunCMake/add_subdirectory/DoesNotExist.cmake |1 +
.../Missing-result.txt}|0
Tests/RunCMake/add_subdirectory/Missing-stderr.txt |8
Tests/RunCMake/add_subdirectory/Missing.cmake |1 +
.../RunCMake/add_subdirectory/Missing/Missing.txt |0
Tests/RunCMake/add_subdirectory/RunCMakeTest.cmake |4
11 files changed, 22 insertions(+), 2 deletions(-)
copy Tests/RunCMake/{AutoExportDll => add_subdirectory}/CMakeLists.txt (100%)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =>
add_subdirectory/DoesNotExist-result.txt} (100%)
create mode 100644 Tests/RunCMake/add_subdirectory/DoesNotExist-stderr.txt
create mode 100644 Tests/RunCMake/add_subdirectory/DoesNotExist.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =>
add_subdirectory/Missing-result.txt} (100%)
create mode 100644 Tests/RunCMake/add_subdirectory/Missing-stderr.txt
create mode 100644 Tests/RunCMake/add_subdirectory/Missing.cmake
copy Modules/IntelVSImplicitPath/hello.f =>
Tests/RunCMake/add_subdirectory/Missing/Missing.txt (100%)
create mode 100644 Tests/RunCMake/add_subdirectory/RunCMakeTest.cmake
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.3.0-753-g91c1b13
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 91c1b13d6e369190d6c8293d27cda1f6fba160d3 (commit) via 43c94281401cfa89bcbe7110727845ed5df984ec (commit) from 78141e799cac1f25e9d21e487ccaea3381a3715d (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=91c1b13d6e369190d6c8293d27cda1f6fba160d3 commit 91c1b13d6e369190d6c8293d27cda1f6fba160d3 Merge: 78141e7 43c9428 Author: Brad King AuthorDate: Thu Aug 6 09:38:31 2015 -0400 Commit: CMake Topic Stage CommitDate: Thu Aug 6 09:38:31 2015 -0400 Merge topic 'ninja-LINK_DEPENDS' 43c94281 Ninja: Honor the LINK_DEPENDS target property (#14796) --- Summary of changes: Source/cmNinjaTargetGenerator.cxx |9 + Tests/BuildDepends/CMakeLists.txt |2 +- 2 files changed, 10 insertions(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.3.0-760-g2259080
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 22590805bffe74c3b4998152556561a2c2b6d177 (commit) via 94226751cb9beb7aa1939e9395d4999e30b30600 (commit) via 105011e08fafe23cb4cfd4fcb1468187f9d81f21 (commit) via d882d4770fec6d65d82d818b4979cb5763d253c1 (commit) via 145735b748ab04505ab7a885a54fbd175ccecee2 (commit) via e26f53a88b2fd16fc54513adfbb8eaab26dd102f (commit) via 64aacb24b65e5496b4148437ed96363ae06e8200 (commit) from 91c1b13d6e369190d6c8293d27cda1f6fba160d3 (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=22590805bffe74c3b4998152556561a2c2b6d177 commit 22590805bffe74c3b4998152556561a2c2b6d177 Merge: 91c1b13 9422675 Author: Brad King AuthorDate: Thu Aug 6 09:38:33 2015 -0400 Commit: CMake Topic Stage CommitDate: Thu Aug 6 09:38:33 2015 -0400 Merge topic 'cpack-rpm-documentation-fixes' 94226751 Tests/RunCMake/CPack: Add dependencies tests 105011e0 Tests/RunCMake/CPack: Bump verify result cmake version d882d477 Tests/RunCMake/CPack/DEB: Add getPackageInfo helper function 145735b7 Tests/RunCMake/CPack: Enable CXX language in tests e26f53a8 CPack/RPM: missing PACKAGE_CONFLICTS documentation 64aacb24 CPack/RPM: undocumented variables --- Summary of changes: Modules/CPackRPM.cmake | 73 Tests/RunCMake/CPack/CMakeLists.txt|2 +- .../CPack/DEB/DEPENDENCIES-ExpectedFiles.cmake | 14 .../CPack/DEB/DEPENDENCIES-VerifyResult.cmake | 15 .../CPack/DEB/DEPENDENCIES-specifics.cmake | 15 Tests/RunCMake/CPack/DEB/Helpers.cmake | 10 +++ Tests/RunCMake/CPack/DEPENDENCIES.cmake| 18 + .../CPack/RPM/DEPENDENCIES-ExpectedFiles.cmake | 13 .../CPack/RPM/DEPENDENCIES-VerifyResult.cmake | 45 .../CPack/RPM/DEPENDENCIES-specifics.cmake | 22 ++ Tests/RunCMake/CPack/RunCMakeTest.cmake|1 + Tests/RunCMake/CPack/VerifyResult.cmake|2 +- 12 files changed, 228 insertions(+), 2 deletions(-) create mode 100644 Tests/RunCMake/CPack/DEB/DEPENDENCIES-ExpectedFiles.cmake create mode 100644 Tests/RunCMake/CPack/DEB/DEPENDENCIES-VerifyResult.cmake create mode 100644 Tests/RunCMake/CPack/DEB/DEPENDENCIES-specifics.cmake create mode 100644 Tests/RunCMake/CPack/DEPENDENCIES.cmake create mode 100644 Tests/RunCMake/CPack/RPM/DEPENDENCIES-ExpectedFiles.cmake create mode 100644 Tests/RunCMake/CPack/RPM/DEPENDENCIES-VerifyResult.cmake create mode 100644 Tests/RunCMake/CPack/RPM/DEPENDENCIES-specifics.cmake hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.3.0-712-g73e3de3
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 73e3de381d87a635e303e2076a46cb739466c1a4 (commit)
via 757a1f54085af4645ee1946329e24538162ac054 (commit)
via 52dbe654dea7562564be9d880540e6bc706998ba (commit)
via 65a5e0c671fc7d42525a6279aebf9a74de2c97a7 (commit)
via 348354333a82ce98d733dc2ee939186c53c506f9 (commit)
via af0de01c6b3395fb1dba5d2ee0a94c19a9b464e9 (commit)
via 6ae8b30bf4127011284a66541ed2116fcb45f007 (commit)
via a5fc17b5098ee27fd7ae457ca6c5743bacc384a7 (commit)
via 0a01e6c6e7bd428ca0ec99a00924b5b498c6e637 (commit)
via f0005bb484bc2b85a169ef7816e33d8e2f16e109 (commit)
from 370e2c6785ce9167c9945763505353816780326c (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=73e3de381d87a635e303e2076a46cb739466c1a4
commit 73e3de381d87a635e303e2076a46cb739466c1a4
Merge: 370e2c6 757a1f5
Author: Brad King
AuthorDate: Thu Aug 6 09:38:24 2015 -0400
Commit: CMake Topic Stage
CommitDate: Thu Aug 6 09:38:24 2015 -0400
Merge topic 'cmState-policies'
757a1f54 cmState: Move PolicyState from cmMakefile.
52dbe654 cmState: Record the end position of each directory.
65a5e0c6 cmLinkedTree: Add Clear API.
34835433 cmState: Add Type for policy scope.
af0de01c cmState: Remove call stack parent tracking.
6ae8b30b cmMakefile: Move policy barriers inside cmState scopes.
a5fc17b5 cmMakefile: Re-order policy entries and barriers.
0a01e6c6 cmState: Add Snapshot Type accessor.
f0005bb4 Tests: Verify generate-time policy scope behavior.
diff --cc Source/cmMakefile.cxx
index 165e271,a0a36ec..60a11e1
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@@ -236,15 -235,7 +236,10 @@@ cmMakefile::~cmMakefile(
cmDeleteAll(this->ImportedTargetsOwned);
cmDeleteAll(this->FinalPassCommands);
cmDeleteAll(this->FunctionBlockers);
+ cmDeleteAll(this->EvaluationFiles);
+ this->EvaluationFiles.clear();
+
this->FunctionBlockers.clear();
- if (this->PolicyStack.size() != 1)
- {
- cmSystemTools::Error("Internal CMake Error, Policy Stack has not been"
- " popped properly");
- }
}
//
---
Summary of changes:
Source/cmLinkedTree.h |6 +
Source/cmMakefile.cxx | 130 ---
Source/cmMakefile.h| 13 --
Source/cmState.cxx | 171 ++--
Source/cmState.h | 15 +-
Tests/RunCMake/CMakeLists.txt |1 +
.../RunCMake/{Ninja => PolicyScope}/CMakeLists.txt |2 +-
Tests/RunCMake/PolicyScope/RunCMakeTest.cmake |4 +
.../dir-in-macro-generate-time-result.txt} |0
.../dir-in-macro-generate-time-stderr.txt} |4 +-
.../PolicyScope/dir-in-macro-generate-time.cmake |2 +
.../PolicyScope/dir-in-macro-include.cmake |6 +
Tests/RunCMake/PolicyScope/dir1/CMakeLists.txt |5 +
.../PolicyScope/dir1/foo.cpp} |0
.../parent-dir-generate-time-result.txt} |0
.../PolicyScope/parent-dir-generate-time.cmake |7 +
16 files changed, 235 insertions(+), 131 deletions(-)
copy Tests/RunCMake/{Ninja => PolicyScope}/CMakeLists.txt (66%)
create mode 100644 Tests/RunCMake/PolicyScope/RunCMakeTest.cmake
copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt =>
PolicyScope/dir-in-macro-generate-time-result.txt} (100%)
copy Tests/RunCMake/{GeneratorExpression/CMP0044-WARN-stderr.txt =>
PolicyScope/dir-in-macro-generate-time-stderr.txt} (69%)
create mode 100644 Tests/RunCMake/PolicyScope/dir-in-macro-generate-time.cmake
create mode 100644 Tests/RunCMake/PolicyScope/dir-in-macro-include.cmake
create mode 100644 Tests/RunCMake/PolicyScope/dir1/CMakeLists.txt
copy Tests/{CTestTestCycle/simple.cxx => RunCMake/PolicyScope/dir1/foo.cpp}
(100%)
copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt =>
PolicyScope/parent-dir-generate-time-result.txt} (100%)
create mode 100644 Tests/RunCMake/PolicyScope/parent-dir-generate-time.cmake
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.3.0-749-g5570650
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 55706506c7bd84ded84a85042ac8bd72f4506411 (commit) via a309409ead0bde721a17e8b3c4e89fe6a2181423 (commit) via f83e84028ac28ce098ea76bd857ae1663c295494 (commit) via b3f0e35308993de825f00ec18fc6559e6609c9b0 (commit) via 34c437411dad89c671261269f2067129584a4259 (commit) via 4329a71c128f8a8fca48a8827226d09f61fcbe85 (commit) via c93230ac3838231f2f44986e224da1bdaf9a7dfe (commit) via ee26add4f4062d8b53f22e161027a573dc03399c (commit) via c8a5f5ae60c911298fc3c0f168ac3652223722a4 (commit) via f8076644ce21c5c20cb0d368d25c191a05364481 (commit) via 7c809fa2a675b7e669e76683f73397e38dd22999 (commit) via 6da99de3236fbaeebf6a4fc66f7d68f43a59902f (commit) via d6bb319b09d056428468d8894f7d7dd2cb0d963e (commit) via 7a460852fa1bc9df22d4c54bac3d57f909488608 (commit) via d560bfd2739f2594119c49d82485b99bb4fbbe1f (commit) via 89e2a080e977b9632fa13c627b6a5370250d6ed5 (commit) via 62720e44be3e9f28e4c1e7d38206b2c51d34745e (commit) via e27d737e27fbfc8cfde020ec02d6b2c74afb6885 (commit) via 8d2de00244f8338664c16bd8d8ebb03c6f0cb83f (commit) via 3df705681be123d93146156fec3166b41b19465a (commit) via a45fed81e5fd5d9b280c8dd70d50c9606a982a0b (commit) via f0aa660772565545cbcda9ed8ae946b8d5097416 (commit) via 766839c56da82e12b6986fb5cf7c8d86442615bc (commit) via 47803e6f8e98984e740acf2f7c0a217de58717cd (commit) via 7da4c9d4edbdd6df6aa2a9467d6f32a98fc8cac4 (commit) via 97f10e488a5153e45d6a27a730cc1ecbaae7d559 (commit) via 4b86f5edc91ba649908f5b6ab0fb7f1154e38066 (commit) via 5ff813c7a62d6c37b86bbf9a988a91baa4d5b9e6 (commit) via 38d4ba3564b9a37f8042888ffd63bf736852b6b8 (commit) via 90bad039c44195b742740613a34b90697254fdd2 (commit) via 803a7982b4403c690d7b7fa8c49d00a5abae3471 (commit) via c971338416d7376d8b710b5c18957f6a800b3de0 (commit) via 244c5b5dcdc5af1f91a79a81f7f7ec4047759fe8 (commit) via 12bc571c13eda8d504eac788d6b3e5e8d83e3ad3 (commit) via 41abdc17df99662a8e99ba895050dbc8c0e34b8e (commit) via 1aa13f2b58e477095f76d28a8d9bb1b83a9dd1f5 (commit) via 1ab59f688f647abe1bc0b5e7a187ec0bac988e0f (commit) from 73e3de381d87a635e303e2076a46cb739466c1a4 (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=55706506c7bd84ded84a85042ac8bd72f4506411 commit 55706506c7bd84ded84a85042ac8bd72f4506411 Merge: 73e3de3 a309409 Author: Brad King AuthorDate: Thu Aug 6 09:38:27 2015 -0400 Commit: CMake Topic Stage CommitDate: Thu Aug 6 09:38:27 2015 -0400 Merge topic 'use-generator-target' a309409e cmOrderDirectories: Port to cmGeneratorTarget. f83e8402 cmGeneratorTarget: Move CompileInfoMap from cmTarget. b3f0e353 cmGeneratorTarget: Move GetCompilePDBDirectory from cmTarget. 34c43741 cmGeneratorTarget: Move GetOutputName from cmTarget. 4329a71c cmComputeLinkDepends: Port to cmGeneratorTarget. c93230ac cmComputeLinkInformation: Port to cmGeneratorTarget. ee26add4 cmGeneratorTarget: Move IsBundleOnApple from cmTarget. c8a5f5ae cmMakefileTargetGenerator: Add accessor for GeneratorTarget. f8076644 cmGeneratorTarget: Move GetLinkClosure from cmTarget. 7c809fa2 cmGeneratorTarget: Move GetLinkerLanguage from cmTarget. 6da99de3 cmGeneratorTarget: Move GetFrameworkDirectory from cmTarget. d6bb319b cmGeneratorTarget: Move GetFullName from cmTarget. 7a460852 cmGeneratorTarget: Move GetAppBundleDirectory from cmTarget. d560bfd2 cmGeneratorTarget: Move GetInstallNameDir* from cmTarget. 89e2a080 cmGeneratorTarget: Move GetMacContentDirectory from cmTarget. 62720e44 cmGeneratorTarget: Move GetFullNameComponents from cmTarget. ... --- Summary of changes: Source/cmCommonTargetGenerator.cxx |5 +- Source/cmComputeLinkDepends.cxx| 17 +- Source/cmComputeLinkDepends.h |6 +- Source/cmComputeLinkInformation.cxx| 80 +- Source/cmComputeLinkInformation.h |6 +- Source/cmExportBuildFileGenerator.cxx | 10 +- Source/cmExportBuildFileGenerator.h|3 +- Source/cmExportFileGenerator.cxx | 17 +- Source/cmExportFileGenerator.h |4 +- Source/cmExportInstallFileGenerator.cxx| 12 +- Source/cmExportInstallFileGenerator.h |3 +- Source/cmExportT
[Cmake-commits] CMake branch, next, updated. v3.3.0-2007-ge48c57b
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 e48c57b81341ee14e0ac61f683224b1dd7b544f0 (commit) via 22590805bffe74c3b4998152556561a2c2b6d177 (commit) via 91c1b13d6e369190d6c8293d27cda1f6fba160d3 (commit) via 78141e799cac1f25e9d21e487ccaea3381a3715d (commit) via 55706506c7bd84ded84a85042ac8bd72f4506411 (commit) via 73e3de381d87a635e303e2076a46cb739466c1a4 (commit) via 370e2c6785ce9167c9945763505353816780326c (commit) via 4f0a6d462e1c22d7c681aac5dd77ce73a560f9f2 (commit) via d356bced9b362be1396c91854e0684da6ec6f507 (commit) via 42526efec45993466cbc605eb2cee70194eed4a6 (commit) from 6d0cf23c5d225f629bfc076eac4340cfac28e597 (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=e48c57b81341ee14e0ac61f683224b1dd7b544f0 commit e48c57b81341ee14e0ac61f683224b1dd7b544f0 Merge: 6d0cf23 2259080 Author: Brad King AuthorDate: Thu Aug 6 09:38:48 2015 -0400 Commit: Brad King CommitDate: Thu Aug 6 09:38:48 2015 -0400 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/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.3.0-2009-gf8d61cb
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 f8d61cbe5066a6d8ce3e09afc40cdf1ea0e73631 (commit)
via 35aab9df9f299d62edaa6ce611aa30614deb9e9d (commit)
from e48c57b81341ee14e0ac61f683224b1dd7b544f0 (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=f8d61cbe5066a6d8ce3e09afc40cdf1ea0e73631
commit f8d61cbe5066a6d8ce3e09afc40cdf1ea0e73631
Merge: e48c57b 35aab9d
Author: Brad King
AuthorDate: Thu Aug 6 11:07:25 2015 -0400
Commit: CMake Topic Stage
CommitDate: Thu Aug 6 11:07:25 2015 -0400
Merge topic 'fix-TARGET_FILE-imported' into next
35aab9df Reject TARGET_PDB_FILE for imported targets instead of crashing
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=35aab9df9f299d62edaa6ce611aa30614deb9e9d
commit 35aab9df9f299d62edaa6ce611aa30614deb9e9d
Author: Brad King
AuthorDate: Mon Aug 3 15:28:41 2015 -0400
Commit: Brad King
CommitDate: Thu Aug 6 09:42:31 2015 -0400
Reject TARGET_PDB_FILE for imported targets instead of crashing
Reported-by: Justin Borodinsky
diff --git a/Source/cmGeneratorExpressionNode.cxx
b/Source/cmGeneratorExpressionNode.cxx
index a86c2bc..44a9adb 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -1600,6 +1600,13 @@ struct
TargetFilesystemArtifactResultCreator
cmGeneratorExpressionContext *context,
const GeneratorExpressionContent *content)
{
+if (target->IsImported())
+ {
+ ::reportError(context, content->GetOriginalExpression(),
+"TARGET_PDB_FILE not allowed for IMPORTED targets.");
+ return std::string();
+ }
+
std::string language = target->GetLinkerLanguage(context->Config);
std::string pdbSupportVar = "CMAKE_" + language + "_LINKER_SUPPORTS_PDB";
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index c831704..e490368 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1248,6 +1248,7 @@ void cmGeneratorTarget::ComputeLinkClosure(const
std::string& config,
UNORDERED_SET languages;
cmTarget::LinkImplementation const* impl =
this->Target->GetLinkImplementation(config);
+ assert(impl);
for(std::vector::const_iterator li = impl->Languages.begin();
li != impl->Languages.end(); ++li)
{
diff --git
a/Tests/RunCMake/GeneratorExpression/ImportedTarget-TARGET_PDB_FILE-result.txt
b/Tests/RunCMake/GeneratorExpression/ImportedTarget-TARGET_PDB_FILE-result.txt
new file mode 100644
index 000..d00491f
--- /dev/null
+++
b/Tests/RunCMake/GeneratorExpression/ImportedTarget-TARGET_PDB_FILE-result.txt
@@ -0,0 +1 @@
+1
diff --git
a/Tests/RunCMake/GeneratorExpression/ImportedTarget-TARGET_PDB_FILE-stderr.txt
b/Tests/RunCMake/GeneratorExpression/ImportedTarget-TARGET_PDB_FILE-stderr.txt
new file mode 100644
index 000..d915ecb
--- /dev/null
+++
b/Tests/RunCMake/GeneratorExpression/ImportedTarget-TARGET_PDB_FILE-stderr.txt
@@ -0,0 +1,8 @@
+CMake Error at ImportedTarget-TARGET_PDB_FILE.cmake:2 \(add_custom_target\):
+ Error evaluating generator expression:
+
+\$
+
+ TARGET_PDB_FILE not allowed for IMPORTED targets.
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
diff --git
a/Tests/RunCMake/GeneratorExpression/ImportedTarget-TARGET_PDB_FILE.cmake
b/Tests/RunCMake/GeneratorExpression/ImportedTarget-TARGET_PDB_FILE.cmake
new file mode 100644
index 000..c55c5d5
--- /dev/null
+++ b/Tests/RunCMake/GeneratorExpression/ImportedTarget-TARGET_PDB_FILE.cmake
@@ -0,0 +1,2 @@
+add_library(empty UNKNOWN IMPORTED)
+add_custom_target(custom COMMAND echo $)
diff --git a/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake
b/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake
index 1c8fab5..cba3941 100644
--- a/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake
+++ b/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake
@@ -26,6 +26,7 @@ run_cmake(COMPILE_LANGUAGE-add_library)
run_cmake(COMPILE_LANGUAGE-add_test)
run_cmake(COMPILE_LANGUAGE-unknown-lang)
+run_cmake(ImportedTarget-TARGET_PDB_FILE)
if(LINKER_SUPPORTS_PDB)
run_cmake(NonValidTarget-TARGET_PDB_FILE)
run_cmake(ValidTarget-TARGET_PDB_FILE)
---
Summary of changes:
Source/cmGeneratorExpressionNode.cxx|7 +++
Source/cmGeneratorTarget.cxx|1 +
.../ImportedTarget-TARGET_PDB_FILE-result.txt} |0
...ILE-stderr.txt => Importe
[Cmake-commits] CMake branch, next, updated. v3.3.0-2011-g925cb2e
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 925cb2ee6c3614195fc1786a3c909ec3092f3b89 (commit)
via afeb4eb243e01df5c7396dc346f2629b21115e2c (commit)
from f8d61cbe5066a6d8ce3e09afc40cdf1ea0e73631 (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=925cb2ee6c3614195fc1786a3c909ec3092f3b89
commit 925cb2ee6c3614195fc1786a3c909ec3092f3b89
Merge: f8d61cb afeb4eb
Author: James Johnston
AuthorDate: Thu Aug 6 13:44:31 2015 -0400
Commit: CMake Topic Stage
CommitDate: Thu Aug 6 13:44:31 2015 -0400
Merge topic 'change-nmake-env-warning' into next
afeb4eb2 nmake/jom: Only warn about bad VS environment if compiler not
found.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=afeb4eb243e01df5c7396dc346f2629b21115e2c
commit afeb4eb243e01df5c7396dc346f2629b21115e2c
Author: James Johnston
AuthorDate: Wed Aug 5 21:23:07 2015 +
Commit: James Johnston
CommitDate: Thu Aug 6 17:32:43 2015 +
nmake/jom: Only warn about bad VS environment if compiler not found.
nmake and jom generators no longer warn about missing INCLUDE/LIB
environment variables unless the C/CXX compiler cannot be found. This
is useful if the user does not want to use these generators with the
Visual C++ compiler, or they do not want to enable any language.
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 3402fbc..ec916ae 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -374,6 +374,8 @@ protected:
void SetLanguageEnabledFlag(const std::string& l, cmMakefile* mf);
void SetLanguageEnabledMaps(const std::string& l, cmMakefile* mf);
void FillExtensionToLanguageMap(const std::string& l, cmMakefile* mf);
+ virtual void PrintCompilerAdvice(std::ostream& os, std::string const& lang,
+ const char* envVar) const;
virtual bool ComputeTargetDepends();
@@ -462,8 +464,6 @@ private:
virtual void ForceLinkerLanguages();
- virtual void PrintCompilerAdvice(std::ostream& os, std::string const& lang,
- const char* envVar) const;
void CheckCompilerIdCompatibility(cmMakefile* mf,
std::string const& lang) const;
diff --git a/Source/cmGlobalJOMMakefileGenerator.cxx
b/Source/cmGlobalJOMMakefileGenerator.cxx
index 50e7053..3f33f91 100644
--- a/Source/cmGlobalJOMMakefileGenerator.cxx
+++ b/Source/cmGlobalJOMMakefileGenerator.cxx
@@ -36,18 +36,6 @@ void cmGlobalJOMMakefileGenerator
// pick a default
mf->AddDefinition("CMAKE_GENERATOR_CC", "cl");
mf->AddDefinition("CMAKE_GENERATOR_CXX", "cl");
- if(!(cmSystemTools::GetEnv("INCLUDE") &&
- cmSystemTools::GetEnv("LIB"))
-)
-{
-std::string message = "To use the JOM generator, cmake must be run "
- "from a shell that can use the compiler cl from the command line. "
- "This environment does not contain INCLUDE, LIB, or LIBPATH, and "
- "these must be set for the cl compiler to work. ";
-mf->IssueMessage(cmake::WARNING,
- message);
-}
-
this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional);
}
@@ -58,3 +46,19 @@ void cmGlobalJOMMakefileGenerator
entry.Name = cmGlobalJOMMakefileGenerator::GetActualName();
entry.Brief = "Generates JOM makefiles.";
}
+
+//
+void cmGlobalJOMMakefileGenerator::PrintCompilerAdvice(std::ostream& os,
+ std::string const& lang,
+ const char* envVar) const
+{
+ if(lang == "CXX" || lang == "C")
+{
+os <<
+ "To use the JOM generator with Visual C++, cmake must be run from a "
+ "shell that can use the compiler cl from the command line. This "
+ "environment is unable to invoke the cl compiler. To fix this problem, "
+ "run cmake from the Visual Studio Command Prompt (vcvarsall.bat).\n";
+}
+ this->cmGlobalUnixMakefileGenerator3::PrintCompilerAdvice(os, lang, envVar);
+}
diff --git a/Source/cmGlobalJOMMakefileGenerator.h
b/Source/cmGlobalJOMMakefileGenerator.h
index 2185b23..1869fed 100644
--- a/Source/cmGlobalJOMMakefileGenerator.h
+++ b/Source/cmGlobalJOMMakefileGenerator.h
@@ -42,6 +42,9 @@ public:
*/
virtual void EnableLanguage(std::vectorconst& languages,
cmMakefile *, bool optional);
+private:
+ void PrintCompilerAdvice(std::ostream& os, std::string const& lang,
+ const char* envVar) con
[Cmake-commits] CMake branch, next, updated. v3.3.0-2015-g3f834d0
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 3f834d0477db40bfb619b19ca66969e04d36a323 (commit)
via d035e9687a2d28e2f64ec3a316f8abea57e49d63 (commit)
via 38ed5866ed212effe0217f193f728ee54ea7378b (commit)
via 772ca69f803a8f294d6e04f9e258becc35179233 (commit)
from 925cb2ee6c3614195fc1786a3c909ec3092f3b89 (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=3f834d0477db40bfb619b19ca66969e04d36a323
commit 3f834d0477db40bfb619b19ca66969e04d36a323
Merge: 925cb2e d035e96
Author: James Johnston
AuthorDate: Thu Aug 6 14:02:05 2015 -0400
Commit: CMake Topic Stage
CommitDate: Thu Aug 6 14:02:05 2015 -0400
Merge topic 'fix-get-filename-component' into next
d035e968 get_filename_component: Fix bug where CACHE was ignored.
38ed5866 get_filename_component: Added initial tests for PROGRAM component.
772ca69f get_filename_component: Tests now check for proper CACHE usage.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d035e9687a2d28e2f64ec3a316f8abea57e49d63
commit d035e9687a2d28e2f64ec3a316f8abea57e49d63
Author: James Johnston
AuthorDate: Wed Aug 5 00:33:59 2015 -0400
Commit: James Johnston
CommitDate: Thu Aug 6 17:53:34 2015 +
get_filename_component: Fix bug where CACHE was ignored.
If PROGRAM_ARGS is provided to get_filename_component, fix bug where the
command failed to honor the CACHE argument.
Added test cases to RunCMake.get_filename_component that fail when the
bug is not fixed to prevent regressions.
Signed-off-by: James Johnston
diff --git a/Source/cmGetFilenameComponentCommand.cxx
b/Source/cmGetFilenameComponentCommand.cxx
index 67f9f2d..13a9afb 100644
--- a/Source/cmGetFilenameComponentCommand.cxx
+++ b/Source/cmGetFilenameComponentCommand.cxx
@@ -24,7 +24,7 @@ bool cmGetFilenameComponentCommand
// Check and see if the value has been stored in the cache
// already, if so use that value
- if(args.size() == 4 && args[3] == "CACHE")
+ if(args.size() >= 4 && args[args.size() - 1] == "CACHE")
{
const char* cacheValue = this->Makefile->GetDefinition(args[0]);
if(cacheValue && !cmSystemTools::IsNOTFOUND(cacheValue))
@@ -111,7 +111,7 @@ bool cmGetFilenameComponentCommand
return false;
}
- if(args.size() == 4 && args[3] == "CACHE")
+ if(args.size() >= 4 && args[args.size() - 1] == "CACHE")
{
if(!programArgs.empty() && !storeArgs.empty())
{
diff --git a/Tests/RunCMake/get_filename_component/KnownComponents.cmake
b/Tests/RunCMake/get_filename_component/KnownComponents.cmake
index 1532792..386109f 100644
--- a/Tests/RunCMake/get_filename_component/KnownComponents.cmake
+++ b/Tests/RunCMake/get_filename_component/KnownComponents.cmake
@@ -62,6 +62,38 @@ check("CACHE 3" "${test_cache}" "/path/to/other")
list(APPEND cache_vars test_cache)
+# Test the PROGRAM component type with CACHE specified.
+
+# 1. Make sure it makes a cache variable in the first place for basic usage:
+get_filename_component(test_cache_program_name_1 "/ arg1 arg2" PROGRAM CACHE)
+check("PROGRAM CACHE 1 with no args output" "${test_cache_program_name_1}" "/")
+list(APPEND cache_vars test_cache_program_name_1)
+
+# 2. Set some existing cache variables & make sure the function returns them:
+set(test_cache_program_name_2 DummyProgramName CACHE FILEPATH "")
+get_filename_component(test_cache_program_name_2 "/ arg1 arg2" PROGRAM CACHE)
+check("PROGRAM CACHE 2 with no args output" "${test_cache_program_name_2}"
+ "DummyProgramName")
+list(APPEND cache_vars test_cache_program_name_2)
+
+# 3. Now test basic usage when PROGRAM_ARGS is used:
+get_filename_component(test_cache_program_name_3 "/ arg1 arg2" PROGRAM
+ PROGRAM_ARGS test_cache_program_args_3 CACHE)
+check("PROGRAM CACHE 3 name" "${test_cache_program_name_3}" "/")
+check("PROGRAM CACHE 3 args" "${test_cache_program_args_3}" " arg1 arg2")
+list(APPEND cache_vars test_cache_program_name_3)
+list(APPEND cache_vars test_cache_program_args_3)
+
+# 4. Test that existing cache variables are returned when PROGRAM_ARGS is used:
+set(test_cache_program_name_4 DummyPgm CACHE FILEPATH "")
+set(test_cache_program_args_4 DummyArgs CACHE STRING "")
+get_filename_component(test_cache_program_name_4 "/ arg1 arg2" PROGRAM
+ PROGRAM_ARGS test_cache_program_args_4 CACHE)
+check("PROGRAM CACHE 4 name" "${test_cache_program_name_4}" "DummyPgm")
+check("PROGRAM CACHE 4 args" "${test_cache_program_args_4}" "DummyArgs")
+list(APPEND cache_vars test_cache_program_name_4)
+list(APPEND cache_vars test_cache_program_name_4)
+
# Test that ONLY the ex
[Cmake-commits] CMake branch, next, updated. v3.3.0-2018-gd78e968
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 d78e96868e693343cef845dff140432d08e543db (commit)
via 1689c91d8d7667426fdca694d801b6189f68d37e (commit)
via dd11f72ced8a5a42ae0a1d7ca8a51b94e670a66f (commit)
from 3f834d0477db40bfb619b19ca66969e04d36a323 (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=d78e96868e693343cef845dff140432d08e543db
commit d78e96868e693343cef845dff140432d08e543db
Merge: 3f834d0 1689c91
Author: Stephen Kelly
AuthorDate: Thu Aug 6 18:32:51 2015 -0400
Commit: CMake Topic Stage
CommitDate: Thu Aug 6 18:32:51 2015 -0400
Merge topic 'rm-Makefile-LocalGenerator' into next
1689c91d cmMakefile: Remove unused method.
dd11f72c cmGlobalGenerator: Base exclusion computation on cmGeneratorTarget.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1689c91d8d7667426fdca694d801b6189f68d37e
commit 1689c91d8d7667426fdca694d801b6189f68d37e
Author: Stephen Kelly
AuthorDate: Sat Jun 6 14:27:52 2015 +0200
Commit: Stephen Kelly
CommitDate: Fri Aug 7 00:32:15 2015 +0200
cmMakefile: Remove unused method.
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 27e5bce..1c4da00 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -114,10 +114,6 @@ public:
bool GetIsSourceFileTryCompile() const;
- ///! Get the current makefile generator.
- cmLocalGenerator* GetLocalGenerator() const
-{ return this->LocalGenerator;}
-
/**
* Help enforce global target name uniqueness.
*/
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd11f72ced8a5a42ae0a1d7ca8a51b94e670a66f
commit dd11f72ced8a5a42ae0a1d7ca8a51b94e670a66f
Author: Stephen Kelly
AuthorDate: Sat Jun 6 14:09:35 2015 +0200
Commit: Stephen Kelly
CommitDate: Fri Aug 7 00:32:15 2015 +0200
cmGlobalGenerator: Base exclusion computation on cmGeneratorTarget.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 3c818ff..bc3c255 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2054,10 +2054,10 @@ bool cmGlobalGenerator::IsExcluded(cmLocalGenerator*
root,
}
bool cmGlobalGenerator::IsExcluded(cmLocalGenerator* root,
- cmTarget const& target) const
+ cmGeneratorTarget* target) const
{
- if(target.GetType() == cmTarget::INTERFACE_LIBRARY
- || target.GetPropertyAsBool("EXCLUDE_FROM_ALL"))
+ if(target->GetType() == cmTarget::INTERFACE_LIBRARY
+ || target->Target->GetPropertyAsBool("EXCLUDE_FROM_ALL"))
{
// This target is excluded from its directory.
return true;
@@ -2066,7 +2066,7 @@ bool cmGlobalGenerator::IsExcluded(cmLocalGenerator* root,
{
// This target is included in its directory. Check whether the
// directory is excluded.
-return this->IsExcluded(root, target.GetMakefile()->GetLocalGenerator());
+return this->IsExcluded(root, target->GetLocalGenerator());
}
}
@@ -2127,15 +2127,16 @@ void cmGlobalGenerator::FillLocalGeneratorToTargetMap()
{
cmTarget const& target = t->second;
+ cmGeneratorTarget* gt = this->GetGeneratorTarget(&target);
+
// Consider the directory containing the target and all its
// parents until something excludes the target.
- for(cmLocalGenerator* clg = lg; clg && !this->IsExcluded(clg, target);
+ for(cmLocalGenerator* clg = lg; clg && !this->IsExcluded(clg, gt);
clg = clg->GetParent())
{
// This local generator includes the target.
std::set& targetSet =
this->LocalGeneratorToTargetMap[clg];
-cmGeneratorTarget* gt = this->GetGeneratorTarget(&target);
targetSet.insert(gt);
// Add dependencies of the included target. An excluded
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 3402fbc..608b59c 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -391,7 +391,7 @@ protected:
void FillProjectMap();
void CheckLocalGenerators();
bool IsExcluded(cmLocalGenerator* root, cmLocalGenerator* gen) const;
- bool IsExcluded(cmLocalGenerator* root, cmTarget const& target) const;
+ bool IsExcluded(cmLocalGenerator* root, cmGeneratorTarget* target) const;
void FillLocalGeneratorToTargetMap();
void CreateDefaultGlobalTargets(cmTargets* targets);
cmTarget CreateGlobalTarget(const std::string& name, const char* message,
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index 2a749c1..47822b4 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/c
[Cmake-commits] CMake branch, next, updated. v3.3.0-2033-g026814a
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 026814ad56e9da194baa1597a4de27920ca5 (commit)
via 97eb20f5421c5cfff2df84617404686089ea71fc (commit)
via 2d60391127bb5be1b4d55a44f8fbc406a3c4eff6 (commit)
via efb9ccca7fd0bb2ca0ec6f4f65d0b4f0ccb83ad4 (commit)
via f62f61a08402f7e4239674fd03a6e93631017021 (commit)
via ad2b607bf7d072fe3c7363446cb81884be7f4221 (commit)
via a58ead9b2f2c8810d8841975ab18486cacb149e9 (commit)
via 7965ba9d008172695aeeb48d327e3942c3684fa9 (commit)
via a57b7aa45efdad49fc8ba2c9ea0525ab5c991b2c (commit)
via d8d6f19e30d0568f1af1297dd616fba0901c388e (commit)
via 76d273e3fbab5af282a6402f66820ed926da7717 (commit)
via 0c86673edbb9956dc29c31242e244fb1b02013c7 (commit)
via ef2771706a641607c146edc738f76e0205ed8577 (commit)
via 13b878b534dbfeb2995569f486e3b0684ef584aa (commit)
via 2ee3bd6f3e99be2dc1bf2b3111681838f0b8d268 (commit)
from d78e96868e693343cef845dff140432d08e543db (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=026814ad56e9da194baa1597a4de27920ca5
commit 026814ad56e9da194baa1597a4de27920ca5
Merge: d78e968 97eb20f
Author: Stephen Kelly
AuthorDate: Thu Aug 6 18:36:53 2015 -0400
Commit: CMake Topic Stage
CommitDate: Thu Aug 6 18:36:53 2015 -0400
Merge topic 'global-generator-makefiles' into next
97eb20f5 cmQtAutoGenerators: Prefer a generator to access global generator.
2d603911 cmGlobalGenerator: Port Find API to cmMakefile.
efb9ccca cmGlobalGenerator: Create global targets from cmMakefiles.
f62f61a0 cmGlobalGenerator: Port global target creation to cmMakefile.
ad2b607b cmGlobalGenerator: Port Configure-time check to cmMakefile.
a58ead9b cmGlobalGenerator: Base final target property computation on
Makefiles.
7965ba9d cmGlobalGenerator: Base progress on Makefiles, not LocalGenerators.
a57b7aa4 cmExportLibraryDependenciesCommand: Port to cmMakefile.
d8d6f19e cmGlobalGenerator: Port configure-time code to cmMakefile.
76d273e3 cmake: Port configure-time code to cmMakefile.
0c86673e cmGlobalGenerator: Store a container of cmMakefiles.
ef277170 cmGeneratorTarget: Port internal type to cmGeneratorTarget.
13b878b5 cmGeneratorTarget: Prefer the local generator to access the global.
2ee3bd6f cmGlobalVisualStudioGenerator: Simplify access to
cmGeneratorTarget.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=97eb20f5421c5cfff2df84617404686089ea71fc
commit 97eb20f5421c5cfff2df84617404686089ea71fc
Author: Stephen Kelly
AuthorDate: Sun Aug 2 20:39:24 2015 +0200
Commit: Stephen Kelly
CommitDate: Fri Aug 7 00:33:58 2015 +0200
cmQtAutoGenerators: Prefer a generator to access global generator.
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index f1ba2f4..c619cdc 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -369,7 +369,7 @@ bool
cmQtAutoGenerators::InitializeAutogenTarget(cmLocalGenerator* lg,
#if defined(_WIN32) && !defined(__CYGWIN__)
bool usePRE_BUILD = false;
- cmGlobalGenerator* gg = makefile->GetGlobalGenerator();
+ cmGlobalGenerator* gg = lg->GetGlobalGenerator();
if(gg->GetName().find("Visual Studio") != std::string::npos)
{
cmGlobalVisualStudioGenerator* vsgg =
@@ -396,7 +396,7 @@ bool
cmQtAutoGenerators::InitializeAutogenTarget(cmLocalGenerator* lg,
std::vector rcc_output;
bool const isNinja =
-makefile->GetGlobalGenerator()->GetName() == "Ninja";
+lg->GetGlobalGenerator()->GetName() == "Ninja";
if(isNinja
#if defined(_WIN32) && !defined(__CYGWIN__)
|| usePRE_BUILD
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d60391127bb5be1b4d55a44f8fbc406a3c4eff6
commit 2d60391127bb5be1b4d55a44f8fbc406a3c4eff6
Author: Stephen Kelly
AuthorDate: Sun Aug 2 12:39:51 2015 +0200
Commit: Stephen Kelly
CommitDate: Fri Aug 7 00:33:58 2015 +0200
cmGlobalGenerator: Port Find API to cmMakefile.
diff --git a/Source/cmGetDirectoryPropertyCommand.cxx
b/Source/cmGetDirectoryPropertyCommand.cxx
index c056d95..2558876 100644
--- a/Source/cmGetDirectoryPropertyCommand.cxx
+++ b/Source/cmGetDirectoryPropertyCommand.cxx
@@ -51,10 +51,8 @@ bool cmGetDirectoryPropertyCommand
sd = cmSystemTools::CollapseFullPath(sd);
// lookup the makefile from the directory name
-cmLocalGenerator *lg =
- this->Makefile->GetGlobalGenerator()->
- FindLocalGenerator(sd);
-if (!lg)
+dir = this->Makefile->GetGlobalGenerator()->FindMakefile(sd);
+if (!dir)
[Cmake-commits] CMake branch, next, updated. v3.3.0-2042-g6b479d5
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 6b479d5ee112efce1565fb8cbdebe389af3a9337 (commit)
via 230c212756e641cbfc6327ce796ffa0f617a4c24 (commit)
via 37554424986199c41fc8825d81490ba75f271edb (commit)
via 94052592b9aa298ed367542841f44cca23b927be (commit)
via ddcae2f2e80e10ef8c1a1e32ef9bfd67272ea766 (commit)
via 24c9ec4569f08e2320fd1c4f43e01bf9cfefae5a (commit)
via 976bd2a8ea0b0d66de06d1c21a483bb29d3ea903 (commit)
via 615dec8af09469e9243b473b7b8a1f970bb7d00f (commit)
via ba3f3e3b43ae3ce8e61a62b90f57c6cfdf6d2243 (commit)
from 026814ad56e9da194baa1597a4de27920ca5 (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=6b479d5ee112efce1565fb8cbdebe389af3a9337
commit 6b479d5ee112efce1565fb8cbdebe389af3a9337
Merge: 026814a 230c212
Author: Stephen Kelly
AuthorDate: Thu Aug 6 18:39:34 2015 -0400
Commit: CMake Topic Stage
CommitDate: Thu Aug 6 18:39:34 2015 -0400
Merge topic 'cmState-definitions' into next
230c2127 cmState: Reserve the number of cmLinkedTree nodes if known.
37554424 cmLinkedTree: Add API for size query and reserve.
94052592 cmState: Host variable definitions.
ddcae2f2 cmState: Add a VariableScope snapshot type.
24c9ec45 cmState: Add a Base snapshot type.
976bd2a8 cmMakefile: Decouple the container of cmDefinitions from scoping
logic.
615dec8a cmDefinitions: Implement in terms of cmLinkedTree.
ba3f3e3b cmMakefile: Extract InitializeVarScope method.
diff --cc Source/cmGlobalGenerator.cxx
index 1885e24,6d079cd..b76f277
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@@ -1148,11 -1183,40 +1184,40 @@@ void cmGlobalGenerator::Configure(
// update the cache entry for the number of local generators, this is used
// for progress
char num[100];
- sprintf(num,"%d",static_cast(this->LocalGenerators.size()));
+ sprintf(num,"%d",static_cast(this->Makefiles.size()));
this->GetCMakeInstance()->AddCacheEntry
-("CMAKE_NUMBER_OF_LOCAL_GENERATORS", num,
+("CMAKE_NUMBER_OF_MAKEFILES", num,
"number of local generators", cmState::INTERNAL);
+ {
+ std::ostringstream str;
+ str << this->GetCMakeInstance()->GetState()->DefinitionsSize();
+ this->GetCMakeInstance()->AddCacheEntry
+ ("CMAKE_NUMBER_OF_DEFINITION_STATES", str.str().c_str(),
+ "number of definition states", cmState::INTERNAL);
+ }
+ {
+ std::ostringstream str;
+ str << this->GetCMakeInstance()->GetState()->SnapshotsSize();
+ this->GetCMakeInstance()->AddCacheEntry
+ ("CMAKE_NUMBER_OF_SNAPSHOT_STATES", str.str().c_str(),
+ "number of snapshot states", cmState::INTERNAL);
+ }
+ {
+ std::ostringstream str;
+ str << this->GetCMakeInstance()->GetState()->ListFilesSize();
+ this->GetCMakeInstance()->AddCacheEntry
+ ("CMAKE_NUMBER_OF_LISTFILE_STATES", str.str().c_str(),
+ "number of listfile states", cmState::INTERNAL);
+ }
+ {
+ std::ostringstream str;
+ str << this->GetCMakeInstance()->GetState()->PoliciesSize();
+ this->GetCMakeInstance()->AddCacheEntry
+ ("CMAKE_NUMBER_OF_POLICY_STATES", str.str().c_str(),
+ "number of policy states", cmState::INTERNAL);
+ }
+
// check for link libraries and include directories containing "NOTFOUND"
// and for infinite loops
this->CheckLocalGenerators();
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=230c212756e641cbfc6327ce796ffa0f617a4c24
commit 230c212756e641cbfc6327ce796ffa0f617a4c24
Author: Stephen Kelly
AuthorDate: Sun Jun 21 13:05:15 2015 +0200
Commit: Stephen Kelly
CommitDate: Fri Aug 7 00:37:42 2015 +0200
cmState: Reserve the number of cmLinkedTree nodes if known.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 3c818ff..6d079cd 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1140,6 +1140,42 @@ void cmGlobalGenerator::Configure()
this->BinaryDirectories.insert(
this->CMakeInstance->GetHomeOutputDirectory());
+ if (const char *numStr =
+ this->GetCMakeInstance()->GetState()
+ ->GetInitializedCacheValue("CMAKE_NUMBER_OF_DEFINITION_STATES"))
+{
+int num = atoi(numStr);
+this->GetCMakeInstance()->GetState()->ReserveDefinitions(num);
+}
+ if (const char *numStr =
+ this->GetCMakeInstance()->GetState()
+ ->GetInitializedCacheValue("CMAKE_NUMBER_OF_SNAPSHOT_STATES"))
+{
+int num = atoi(numStr);
+this->GetCMakeInstance()->GetState()->ReserveSnapshots(num);
+}
+ if (const char *numStr =
+ this->GetCM
[Cmake-commits] CMake branch, next, updated. v3.3.0-2056-gda69b39
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 da69b3979d6e90bff5ce72b49f9c3b8e8496b648 (commit)
via 4730a457d0b9d2f14a07744aea5144e76cb7c266 (commit)
via 058624ce98b34dc2bd63c62f89000bf6fdef03c3 (commit)
via 23ac9e58959cb125a91b45e80d131ab448d66eec (commit)
via d88f83077b3b2c200d58d21bdad65308729ebfd8 (commit)
via 83122c32ab533dbb32ce4ce6de70b069a217b437 (commit)
via 398cdc2be369239bcd9bac5f98fe937a1253f664 (commit)
via 1fe2c9a166727d14b5cc56bfe0425f9be12e578e (commit)
via 906c9a26630e4fcf2360dd9e824b0191ecaf887f (commit)
via ae94ca1c5902dc12ddd7eb7a9e4b197ddde5c884 (commit)
via 239c6d37e28e3a979122999e8555696865fb4824 (commit)
via 10040601a2e13cbb0653a20c55c1c696b5cacf29 (commit)
via d9da6ee29fe0267ed347860f24f21be647ac81e8 (commit)
via 27252b2414f5034b16a447273e1f249fdf317b72 (commit)
from 6b479d5ee112efce1565fb8cbdebe389af3a9337 (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=da69b3979d6e90bff5ce72b49f9c3b8e8496b648
commit da69b3979d6e90bff5ce72b49f9c3b8e8496b648
Merge: 6b479d5 4730a45
Author: Stephen Kelly
AuthorDate: Thu Aug 6 19:03:19 2015 -0400
Commit: CMake Topic Stage
CommitDate: Thu Aug 6 19:03:19 2015 -0400
Merge topic 'use-generator-target' into next
4730a457 cmTarget: Use a simpler delete algorithm.
058624ce cmTarget: Split storage of sources from genexes.
23ac9e58 cmTarget: Split storage of compile definitions from genexes.
d88f8307 cmTarget: Split storage of compile features from genexes.
83122c32 cmTarget: Split storage of compile options from genexes.
398cdc2b cmTarget: Split storage of include directories from genexes.
1fe2c9a1 cmTarget: Request only the link libraries where needed.
906c9a26 cmGeneratorTarget: Move link iface helpers from cmTarget.
ae94ca1c cmGeneratorTarget: Move GetLinkInterface from cmTarget.
239c6d37 cmGlobalGenerator: Return null generator target for target.
10040601 cmLinkImplementationLibraries: Move to namespace scope.
d9da6ee2 cmLinkItem: Split to separate file.
27252b24 cmComputeLinkInformation: Simplify generator object access.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4730a457d0b9d2f14a07744aea5144e76cb7c266
commit 4730a457d0b9d2f14a07744aea5144e76cb7c266
Author: Stephen Kelly
AuthorDate: Tue Aug 4 23:16:12 2015 +0200
Commit: Stephen Kelly
CommitDate: Fri Aug 7 01:03:00 2015 +0200
cmTarget: Use a simpler delete algorithm.
This way, the methods can be moved without requiring a local algorithm.
The containers use automatic storage.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 54934c1..ef2df21 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -161,14 +161,6 @@ public:
cmLinkImplItem cmTargetInternals::TargetPropertyEntry::NoLinkImplItem;
//
-static void deleteAndClear(
- std::vector &entries)
-{
- cmDeleteAll(entries);
- entries.clear();
-}
-
-//
cmTargetInternals::~cmTargetInternals()
{
}
@@ -783,7 +775,7 @@ void cmTarget::GetSourceFiles(std::vector
&files,
this->LinkImplementationLanguageIsContextDependent = false;
}
- deleteAndClear(linkInterfaceSourcesEntries);
+ cmDeleteAll(linkInterfaceSourcesEntries);
}
//
@@ -2138,7 +2130,7 @@ cmTarget::GetIncludeDirectories(const std::string& config,
debugIncludes,
language);
- deleteAndClear(linkInterfaceIncludeDirectoriesEntries);
+ cmDeleteAll(linkInterfaceIncludeDirectoriesEntries);
return includes;
}
@@ -2259,7 +2251,7 @@ void cmTarget::GetCompileOptions(std::vector
&result,
debugOptions,
language);
- deleteAndClear(linkInterfaceCompileOptionsEntries);
+ cmDeleteAll(linkInterfaceCompileOptionsEntries);
}
//
@@ -2361,7 +2353,7 @@ void
cmTarget::GetCompileDefinitions(std::vector &list,
debugDefines,
language);
- deleteAndClear(linkInterfaceCompileDefinitionsEntries);
+ cmDeleteAll(linkInterfaceCompileDefinitionsEntries);
}
//
@@ -2428,7 +2420,7 @@ void
cmTarget::
[Cmake-commits] CMake branch, next, updated. v3.3.0-2058-g7d31d99
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 7d31d99d990b2c64d65a6b82a5f8308024ebb057 (commit)
via c392759a43873a46522fe104db3281d7da3cc24f (commit)
from da69b3979d6e90bff5ce72b49f9c3b8e8496b648 (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=7d31d99d990b2c64d65a6b82a5f8308024ebb057
commit 7d31d99d990b2c64d65a6b82a5f8308024ebb057
Merge: da69b39 c392759
Author: Stephen Kelly
AuthorDate: Thu Aug 6 22:08:05 2015 -0400
Commit: CMake Topic Stage
CommitDate: Thu Aug 6 22:08:05 2015 -0400
Merge topic 'use-generator-target' into next
c392759a fixup! cmTarget: Split storage of include directories from genexes.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c392759a43873a46522fe104db3281d7da3cc24f
commit c392759a43873a46522fe104db3281d7da3cc24f
Author: Stephen Kelly
AuthorDate: Fri Aug 7 04:07:44 2015 +0200
Commit: Stephen Kelly
CommitDate: Fri Aug 7 04:07:44 2015 +0200
fixup! cmTarget: Split storage of include directories from genexes.
diff --git a/Source/cmGlobalXCodeGenerator.cxx
b/Source/cmGlobalXCodeGenerator.cxx
index aae0b23..39933cb 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -463,7 +463,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator*
root,
cmTarget* allbuild = mf->AddUtilityCommand("ALL_BUILD", true, no_depends,
no_working_directory,
"echo", "Build all projects");
- allBuild->Compute();
+ allbuild->Compute();
cmGeneratorTarget* allBuildGt = new cmGeneratorTarget(allbuild, root);
mf->AddGeneratorTarget(allbuild, allBuildGt);
---
Summary of changes:
Source/cmGlobalXCodeGenerator.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/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.3.0-2065-g4237e9d
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 4237e9d3fde9f6fce5cb7fe8c85c21686d8708a5 (commit)
via 047b83c77099879ad16da674930fce5d5df9ac4d (commit)
via 8b501eeb2bba213580ca900f7ad6251e1c8b79e5 (commit)
via ce14c83b5a4115531a6fce4f7523458371a562b3 (commit)
via 1faf5abf53a36491e7c374f80b635278691f76e2 (commit)
via 345897936dd1bdfb43fba555bffad7d8159c1eec (commit)
via 3c4015d83fc87f48042c3125c4ac76689537 (commit)
from 7d31d99d990b2c64d65a6b82a5f8308024ebb057 (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=4237e9d3fde9f6fce5cb7fe8c85c21686d8708a5
commit 4237e9d3fde9f6fce5cb7fe8c85c21686d8708a5
Merge: 7d31d99 047b83c
Author: Stephen Kelly
AuthorDate: Thu Aug 6 22:08:29 2015 -0400
Commit: CMake Topic Stage
CommitDate: Thu Aug 6 22:08:29 2015 -0400
Merge topic 'use-generator-target' into next
047b83c7 cmTarget: Use a simpler delete algorithm.
8b501eeb cmTarget: Split storage of sources from genexes.
ce14c83b cmTarget: Split storage of compile definitions from genexes.
1faf5abf cmTarget: Split storage of compile features from genexes.
34589793 cmTarget: Split storage of compile options from genexes.
3c40 cmTarget: Split storage of include directories from genexes.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=047b83c77099879ad16da674930fce5d5df9ac4d
commit 047b83c77099879ad16da674930fce5d5df9ac4d
Author: Stephen Kelly
AuthorDate: Tue Aug 4 23:16:12 2015 +0200
Commit: Stephen Kelly
CommitDate: Fri Aug 7 04:08:19 2015 +0200
cmTarget: Use a simpler delete algorithm.
This way, the methods can be moved without requiring a local algorithm.
The containers use automatic storage.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 54934c1..ef2df21 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -161,14 +161,6 @@ public:
cmLinkImplItem cmTargetInternals::TargetPropertyEntry::NoLinkImplItem;
//
-static void deleteAndClear(
- std::vector &entries)
-{
- cmDeleteAll(entries);
- entries.clear();
-}
-
-//
cmTargetInternals::~cmTargetInternals()
{
}
@@ -783,7 +775,7 @@ void cmTarget::GetSourceFiles(std::vector
&files,
this->LinkImplementationLanguageIsContextDependent = false;
}
- deleteAndClear(linkInterfaceSourcesEntries);
+ cmDeleteAll(linkInterfaceSourcesEntries);
}
//
@@ -2138,7 +2130,7 @@ cmTarget::GetIncludeDirectories(const std::string& config,
debugIncludes,
language);
- deleteAndClear(linkInterfaceIncludeDirectoriesEntries);
+ cmDeleteAll(linkInterfaceIncludeDirectoriesEntries);
return includes;
}
@@ -2259,7 +2251,7 @@ void cmTarget::GetCompileOptions(std::vector
&result,
debugOptions,
language);
- deleteAndClear(linkInterfaceCompileOptionsEntries);
+ cmDeleteAll(linkInterfaceCompileOptionsEntries);
}
//
@@ -2361,7 +2353,7 @@ void
cmTarget::GetCompileDefinitions(std::vector &list,
debugDefines,
language);
- deleteAndClear(linkInterfaceCompileDefinitionsEntries);
+ cmDeleteAll(linkInterfaceCompileDefinitionsEntries);
}
//
@@ -2428,7 +2420,7 @@ void
cmTarget::GetCompileFeatures(std::vector &result,
config,
debugFeatures);
- deleteAndClear(linkInterfaceCompileFeaturesEntries);
+ cmDeleteAll(linkInterfaceCompileFeaturesEntries);
}
//
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b501eeb2bba213580ca900f7ad6251e1c8b79e5
commit 8b501eeb2bba213580ca900f7ad6251e1c8b79e5
Author: Stephen Kelly
AuthorDate: Tue Aug 4 21:46:15 2015 +0200
Commit: Stephen Kelly
CommitDate: Fri Aug 7 04:08:19 2015 +0200
cmTarget: Split storage of sources from genexes.
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index ce806ba..b094125 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -313,7 +313,9 @@ bool
cmQtAutoGenerators::InitializeAutogenTarget(cmLocalG
[Cmake-commits] CMake branch, next, updated. v3.3.0-2067-g6ec9f59
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 6ec9f59bb05083853f5b25bd8af8733c1c53d650 (commit)
via a987e5f5315554be4705eb4be5c0188b068235c0 (commit)
from 4237e9d3fde9f6fce5cb7fe8c85c21686d8708a5 (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=6ec9f59bb05083853f5b25bd8af8733c1c53d650
commit 6ec9f59bb05083853f5b25bd8af8733c1c53d650
Merge: 4237e9d a987e5f
Author: Stephen Kelly
AuthorDate: Thu Aug 6 22:10:40 2015 -0400
Commit: CMake Topic Stage
CommitDate: Thu Aug 6 22:10:40 2015 -0400
Merge topic 'global-generator-makefiles' into next
a987e5f5 Revert "cmGlobalVisualStudioGenerator: Simplify access to
cmGeneratorTarget."
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a987e5f5315554be4705eb4be5c0188b068235c0
commit a987e5f5315554be4705eb4be5c0188b068235c0
Author: Stephen Kelly
AuthorDate: Fri Aug 7 04:10:01 2015 +0200
Commit: Stephen Kelly
CommitDate: Fri Aug 7 04:10:01 2015 +0200
Revert "cmGlobalVisualStudioGenerator: Simplify access to
cmGeneratorTarget."
This reverts commit 2ee3bd6f3e99be2dc1bf2b3111681838f0b8d268.
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx
b/Source/cmGlobalVisualStudioGenerator.cxx
index 4ac259b..2f9d79a 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -885,7 +885,8 @@ cmGlobalVisualStudioGenerator::OrderedTargetDependSet
for (TargetSet::const_iterator it = targets.begin();
it != targets.end(); ++it)
{
-cmGeneratorTarget* gt = this->GetGeneratorTarget(*it);
+cmGeneratorTarget* gt =
+(*it)->GetMakefile()->GetGlobalGenerator()->GetGeneratorTarget(*it);
this->insert(gt);
}
}
---
Summary of changes:
Source/cmGlobalVisualStudioGenerator.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.3.0-2081-ga4634fb
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 a4634fb344e70d913df2d9dbeb41ec697648f4b0 (commit)
via 6d8a125e4988d5cb269b3d1e29a6114ecd0c47a4 (commit)
via 5f66900e71fdc33b40c46bf8a87b35d88d280769 (commit)
via c5b8841fd96727a290e148e8b5132f893f8b4d4e (commit)
via 8f75ea3b5e0b43118a6ecba4dc11a583d287705c (commit)
via 56f0540b5183036b46babbfc9b9ec0979e54992f (commit)
via 19b546ef766acedfcc9e19541c71b6a56d7fe630 (commit)
via f8be9ba9c258698ed88a7510cf2ba3335491f3da (commit)
via bc1097e3d9a2d9545db849f9eef657477d83509a (commit)
via 204aecdf82aa583b213464411069de4c8d7af64b (commit)
via 3dd6f0a5bc0b6457c82df0b980a8f6ac87d1a6f9 (commit)
via 73e4df99cb4d63f5ea8babb40656a74305d77e12 (commit)
via 193699376af09bd77875d4ddfd10c3feb13ecdd2 (commit)
via 32f131b0ca68bc88bbb32dbf03e76dfba24defe5 (commit)
from 6ec9f59bb05083853f5b25bd8af8733c1c53d650 (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=a4634fb344e70d913df2d9dbeb41ec697648f4b0
commit a4634fb344e70d913df2d9dbeb41ec697648f4b0
Merge: 6ec9f59 6d8a125
Author: Stephen Kelly
AuthorDate: Thu Aug 6 22:10:51 2015 -0400
Commit: CMake Topic Stage
CommitDate: Thu Aug 6 22:10:51 2015 -0400
Merge topic 'global-generator-makefiles' into next
6d8a125e cmQtAutoGenerators: Prefer a generator to access global generator.
5f66900e cmGlobalGenerator: Port Find API to cmMakefile.
c5b8841f cmGlobalGenerator: Create global targets from cmMakefiles.
8f75ea3b cmGlobalGenerator: Port global target creation to cmMakefile.
56f0540b cmGlobalGenerator: Port Configure-time check to cmMakefile.
19b546ef cmGlobalGenerator: Base final target property computation on
Makefiles.
f8be9ba9 cmGlobalGenerator: Base progress on Makefiles, not LocalGenerators.
bc1097e3 cmExportLibraryDependenciesCommand: Port to cmMakefile.
204aecdf cmGlobalGenerator: Port configure-time code to cmMakefile.
3dd6f0a5 cmake: Port configure-time code to cmMakefile.
73e4df99 cmGlobalGenerator: Store a container of cmMakefiles.
19369937 cmGeneratorTarget: Port internal type to cmGeneratorTarget.
32f131b0 cmGeneratorTarget: Prefer the local generator to access the global.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d8a125e4988d5cb269b3d1e29a6114ecd0c47a4
commit 6d8a125e4988d5cb269b3d1e29a6114ecd0c47a4
Author: Stephen Kelly
AuthorDate: Sun Aug 2 20:39:24 2015 +0200
Commit: Stephen Kelly
CommitDate: Fri Aug 7 04:10:29 2015 +0200
cmQtAutoGenerators: Prefer a generator to access global generator.
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index f1ba2f4..c619cdc 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -369,7 +369,7 @@ bool
cmQtAutoGenerators::InitializeAutogenTarget(cmLocalGenerator* lg,
#if defined(_WIN32) && !defined(__CYGWIN__)
bool usePRE_BUILD = false;
- cmGlobalGenerator* gg = makefile->GetGlobalGenerator();
+ cmGlobalGenerator* gg = lg->GetGlobalGenerator();
if(gg->GetName().find("Visual Studio") != std::string::npos)
{
cmGlobalVisualStudioGenerator* vsgg =
@@ -396,7 +396,7 @@ bool
cmQtAutoGenerators::InitializeAutogenTarget(cmLocalGenerator* lg,
std::vector rcc_output;
bool const isNinja =
-makefile->GetGlobalGenerator()->GetName() == "Ninja";
+lg->GetGlobalGenerator()->GetName() == "Ninja";
if(isNinja
#if defined(_WIN32) && !defined(__CYGWIN__)
|| usePRE_BUILD
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f66900e71fdc33b40c46bf8a87b35d88d280769
commit 5f66900e71fdc33b40c46bf8a87b35d88d280769
Author: Stephen Kelly
AuthorDate: Sun Aug 2 12:39:51 2015 +0200
Commit: Stephen Kelly
CommitDate: Fri Aug 7 04:10:29 2015 +0200
cmGlobalGenerator: Port Find API to cmMakefile.
diff --git a/Source/cmGetDirectoryPropertyCommand.cxx
b/Source/cmGetDirectoryPropertyCommand.cxx
index c056d95..2558876 100644
--- a/Source/cmGetDirectoryPropertyCommand.cxx
+++ b/Source/cmGetDirectoryPropertyCommand.cxx
@@ -51,10 +51,8 @@ bool cmGetDirectoryPropertyCommand
sd = cmSystemTools::CollapseFullPath(sd);
// lookup the makefile from the directory name
-cmLocalGenerator *lg =
- this->Makefile->GetGlobalGenerator()->
- FindLocalGenerator(sd);
-if (!lg)
+dir = this->Makefile->GetGlobalGenerator()->FindMakefile(sd);
+if (!dir)
{
this->SetError
("DIRECTORY argument provided but requested directory not found. "
@@ -62,7 +60,6 @@ bool cmGetDirectoryPro
[Cmake-commits] CMake branch, master, updated. v3.3.0-761-g3cefadb
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 3cefadbff07d68c5a6846835ea87cc35eae55a0b (commit) from 22590805bffe74c3b4998152556561a2c2b6d177 (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=3cefadbff07d68c5a6846835ea87cc35eae55a0b commit 3cefadbff07d68c5a6846835ea87cc35eae55a0b Author: Kitware Robot AuthorDate: Fri Aug 7 00:01:07 2015 -0400 Commit: Kitware Robot CommitDate: Fri Aug 7 00:01:07 2015 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index c9fec35..533a881 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 3) -set(CMake_VERSION_PATCH 20150806) +set(CMake_VERSION_PATCH 20150807) #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/mailman/listinfo/cmake-commits
