[Cmake-commits] CMake branch, master, updated. v3.3.1-945-g33df7f3
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 33df7f36d0b99a87880ee76d39b5814c98e78bd1 (commit) from cdb9984bff78b8f76c3b8c3f622928e4f29920a1 (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=33df7f36d0b99a87880ee76d39b5814c98e78bd1 commit 33df7f36d0b99a87880ee76d39b5814c98e78bd1 Author: Kitware Robot kwro...@kitware.com AuthorDate: Wed Aug 26 00:01:07 2015 -0400 Commit: Kitware Robot kwro...@kitware.com CommitDate: Wed Aug 26 00:01:07 2015 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 4e0b28c..aa25287 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 20150825) +set(CMake_VERSION_PATCH 20150826) #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
[Cmake-commits] CMake branch, master, updated. v3.3.1-938-g96dafff
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 96dafff97fb4674db3c47b89902722edef45fc65 (commit) via e7f937155f6f8b117d6292b3ffe6cf63c8eda9c0 (commit) from 90eb6de68ff809b39515a1ac2cff823e86c205e2 (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=96dafff97fb4674db3c47b89902722edef45fc65 commit 96dafff97fb4674db3c47b89902722edef45fc65 Merge: 90eb6de e7f9371 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Aug 25 15:13:31 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Aug 25 15:13:31 2015 -0400 Merge topic 'libarchive-modern-apis' e7f93715 Use modern libarchive APIs --- Summary of changes: Source/cmArchiveWrite.cxx | 28 ++-- Source/cmSystemTools.cxx |4 ++-- 2 files changed, 16 insertions(+), 16 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.1-930-g9aeee9c
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 9aeee9c60887cf2a5528116c5e1d215f35b2f09f (commit) via f4150bd88d80f4a236ea5b0d648d8cc3122092fc (commit) via 0178754725c61dc6778f8591db1433a6c07e9f6f (commit) from a8f884824167c09b5f988b6add0a0b3370b6be8a (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=9aeee9c60887cf2a5528116c5e1d215f35b2f09f commit 9aeee9c60887cf2a5528116c5e1d215f35b2f09f Merge: a8f8848 f4150bd Author: Brad King brad.k...@kitware.com AuthorDate: Tue Aug 25 15:13:23 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Aug 25 15:13:23 2015 -0400 Merge topic 'cmState-prop_dir' f4150bd8 cmState: Move directory Properties from cmMakefile. 01787547 cmMakefile: Inline GetDefinitions into GetProperty. --- Summary of changes: Source/cmMakefile.cxx | 143 +++ Source/cmMakefile.h |3 - Source/cmState.cxx| 163 + Source/cmState.h |9 +++ 4 files changed, 180 insertions(+), 138 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.1-936-g90eb6de
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 90eb6de68ff809b39515a1ac2cff823e86c205e2 (commit) via 64e527dbe3c55a01320b97cff38626171f96f686 (commit) from 84aa2519b00177450b97d328065332ea192f76b8 (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=90eb6de68ff809b39515a1ac2cff823e86c205e2 commit 90eb6de68ff809b39515a1ac2cff823e86c205e2 Merge: 84aa251 64e527d Author: Brad King brad.k...@kitware.com AuthorDate: Tue Aug 25 15:13:29 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Aug 25 15:13:29 2015 -0400 Merge topic 'fphsa-typo' 64e527db FPHSA: fix typo in documentation --- Summary of changes: Modules/FindPackageHandleStandardArgs.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, master, updated. v3.3.1-932-gd030a46
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 d030a46913479442ca12c6d193be546b9f471ca0 (commit) via c4d78b8bc05d44b8a46b5d2db6b52b42a101ef2d (commit) from 9aeee9c60887cf2a5528116c5e1d215f35b2f09f (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=d030a46913479442ca12c6d193be546b9f471ca0 commit d030a46913479442ca12c6d193be546b9f471ca0 Merge: 9aeee9c c4d78b8 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Aug 25 15:13:25 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Aug 25 15:13:25 2015 -0400 Merge topic 'FindJNI-linux-x32' c4d78b8b FindJNI: Add support for x32 architecture on Linux (#15710) --- Summary of changes: Modules/FindJNI.cmake |4 1 file changed, 4 insertions(+) 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.1-934-g84aa251
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 84aa2519b00177450b97d328065332ea192f76b8 (commit) via 1869eacb3d2e897695007f210da219a0ee73cba8 (commit) from d030a46913479442ca12c6d193be546b9f471ca0 (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=84aa2519b00177450b97d328065332ea192f76b8 commit 84aa2519b00177450b97d328065332ea192f76b8 Merge: d030a46 1869eac Author: Brad King brad.k...@kitware.com AuthorDate: Tue Aug 25 15:13:27 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Aug 25 15:13:27 2015 -0400 Merge topic 'fix-load-command-doc-classification' 1869eacb Help: Fix classification of load_command in command TOC. --- Summary of changes: Help/manual/cmake-commands.7.rst |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, master, updated. v3.3.1-944-gcdb9984
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 cdb9984bff78b8f76c3b8c3f622928e4f29920a1 (commit) via e876963fc9e03018a189f4433050d459a475afbf (commit) via 44ffb9cdb4329c5ed9b724659f234d26da336b5a (commit) via 8f89f8b1e9693abbc50d917c04846000bf14e189 (commit) via 524610f967e5289810a0d67a2942493d8f61d1dd (commit) via 0e14c7ee6375fcaa975194557523f5a1a8686a8a (commit) from 96dafff97fb4674db3c47b89902722edef45fc65 (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=cdb9984bff78b8f76c3b8c3f622928e4f29920a1 commit cdb9984bff78b8f76c3b8c3f622928e4f29920a1 Merge: 96dafff e876963 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Aug 25 15:13:33 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Aug 25 15:13:33 2015 -0400 Merge topic 'consistent-empty' e876963f Replace '0 == instances.size()' with instances.empty(). 44ffb9cd Replace foo.size() pattern with !foo.empty(). 8f89f8b1 Replace 'foo.size() != 0' pattern with !foo.empty(). 524610f9 Replace 'foo.size() == 0' pattern with foo.empty(). 0e14c7ee Replace 'foo.size() 0' pattern with !foo.empty(). --- Summary of changes: Source/CPack/IFW/cmCPackIFWGenerator.cxx|2 +- Source/CPack/WiX/cmCPackWIXGenerator.cxx|4 ++-- Source/CPack/WiX/cmWIXAccessControlList.cxx |2 +- Source/CPack/WiX/cmWIXPatch.cxx |2 +- Source/CPack/WiX/cmWIXSourceWriter.cxx |2 +- Source/CPack/cmCPackNSISGenerator.cxx |6 +++--- Source/cmCallVisualStudioMacro.cxx |2 +- Source/cmGlobalMSYSMakefileGenerator.cxx|6 +++--- Source/cmGlobalVisualStudio6Generator.cxx |2 +- Source/cmGlobalVisualStudio71Generator.cxx |4 ++-- Source/cmGlobalVisualStudio7Generator.cxx |4 ++-- Source/cmGlobalVisualStudioGenerator.cxx|4 ++-- Source/cmGlobalXCodeGenerator.cxx |6 +++--- Source/cmLocalVisualStudio10Generator.cxx |2 +- Source/cmLocalVisualStudio6Generator.cxx| 14 +++--- Source/cmLocalVisualStudio7Generator.cxx|4 ++-- Source/cmVisualStudio10TargetGenerator.cxx |8 Source/cmVisualStudioGeneratorOptions.cxx |6 +++--- Source/cmXCode21Object.cxx |2 +- 19 files changed, 41 insertions(+), 41 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, next, updated. v3.3.1-2448-gd70e7e1
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 d70e7e1491ec53571d1948c89cf658393ebee406 (commit) via cdb9984bff78b8f76c3b8c3f622928e4f29920a1 (commit) via 96dafff97fb4674db3c47b89902722edef45fc65 (commit) via 90eb6de68ff809b39515a1ac2cff823e86c205e2 (commit) via 84aa2519b00177450b97d328065332ea192f76b8 (commit) via d030a46913479442ca12c6d193be546b9f471ca0 (commit) via 9aeee9c60887cf2a5528116c5e1d215f35b2f09f (commit) via a8f884824167c09b5f988b6add0a0b3370b6be8a (commit) from 7a826b20db6797d1d49ca9851ee744c94dd9374e (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=d70e7e1491ec53571d1948c89cf658393ebee406 commit d70e7e1491ec53571d1948c89cf658393ebee406 Merge: 7a826b2 cdb9984 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Aug 25 15:13:42 2015 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Aug 25 15:13:42 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.1-2516-g12af124
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 12af1245ee99372e77d8ae50feb3cc25c33c8362 (commit)
via ccb4496f6451a4bcbf20f5cf67c7f2e7451e581b (commit)
via 9e70086973b3cca74a9455535467dc9dd3b889bf (commit)
via 94644f864db95d61c680f92d6cfd1a4928305331 (commit)
via e585982cbb2910be05cd2a50aec455fc6f6528d2 (commit)
via 76c351181ab69f57ab741ea869b20e5526dea4cb (commit)
via ef4fdfd49a02952ca5b2e347f0c041fbf3ae48a1 (commit)
via ef9431a968e2ef77159a1ac1c8fa931c8a179eb2 (commit)
via d09514361491425ce25c27518167a2ce78c568c8 (commit)
via 784e1d001a151d17884b124cc12e5a9ef9878477 (commit)
via 0ff2e1ea2a7b70ee828f3738df884378917f261e (commit)
via a9a750bb9372b9b4dbdb506510f99e50fcf1b21b (commit)
via 09c5d93651499887187095c297561d490c51dafe (commit)
from d680282224da579f124c8b26efb71b70db87fd47 (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=12af1245ee99372e77d8ae50feb3cc25c33c8362
commit 12af1245ee99372e77d8ae50feb3cc25c33c8362
Merge: d680282 ccb4496
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Aug 25 17:57:45 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Aug 25 17:57:45 2015 -0400
Merge topic 'use-generator-target' into next
ccb4496f cmGeneratorTarget: Move GetConfigCommonSourceFiles from cmTarget.
9e700869 cmGeneratorTarget: Move GetLanguages from cmTarget.
94644f86 cmGeneratorTarget: Move ComputeLinkImplementationLanguages from
cmTarget.
e585982c cmGeneratorTarget: Move HaveBuildTreeRPath from cmTarget.
76c35118 cmGeneratorTarget: Move GetLinkImplementation from cmTarget.
ef4fdfd4 cmTarget: Add GetLinkImplMap method.
ef9431a9 cmLinkItem: Add cmOptionalLinkImplementation type.
d0951436 cmLinkItem: Add cmLinkImplementation type.
784e1d00 cmGeneratorTarget: Move compile defintions processing from
cmTarget.
0ff2e1ea cmGeneratorTarget: Move compile features processing from cmTarget.
a9a750bb cmGeneratorTarget: Move compile options processing from cmTarget.
09c5d936 cmGeneratorTarget: Move include directory processing from cmTarget.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ccb4496f6451a4bcbf20f5cf67c7f2e7451e581b
commit ccb4496f6451a4bcbf20f5cf67c7f2e7451e581b
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Aug 5 17:37:50 2015 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Aug 25 23:44:15 2015 +0200
cmGeneratorTarget: Move GetConfigCommonSourceFiles from cmTarget.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index e6507e7..5c83879 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4397,11 +4397,68 @@ cmGeneratorTarget::GetLinkImplementation(const
std::string config) const
}
//
+bool cmGeneratorTarget::GetConfigCommonSourceFiles(
+std::vectorcmSourceFile* files) const
+{
+ std::vectorstd::string configs;
+ this-Makefile-GetConfigurations(configs);
+ if (configs.empty())
+{
+configs.push_back();
+}
+
+ std::vectorstd::string::const_iterator it = configs.begin();
+ const std::string firstConfig = *it;
+ this-Target-GetSourceFiles(files, firstConfig);
+
+ for ( ; it != configs.end(); ++it)
+{
+std::vectorcmSourceFile* configFiles;
+this-Target-GetSourceFiles(configFiles, *it);
+if (configFiles != files)
+ {
+ std::string firstConfigFiles;
+ const char* sep = ;
+ for (std::vectorcmSourceFile*::const_iterator fi = files.begin();
+ fi != files.end(); ++fi)
+{
+firstConfigFiles += sep;
+firstConfigFiles += (*fi)-GetFullPath();
+sep = \n ;
+}
+
+ std::string thisConfigFiles;
+ sep = ;
+ for (std::vectorcmSourceFile*::const_iterator fi = configFiles.begin();
+ fi != configFiles.end(); ++fi)
+{
+thisConfigFiles += sep;
+thisConfigFiles += (*fi)-GetFullPath();
+sep = \n ;
+}
+ std::ostringstream e;
+ e Target \ this-GetName()
+ \ has source files which vary by
+configuration. This is not supported by the \
+ this-GlobalGenerator-GetName()
+ \ generator.\n
+ Config \ firstConfig \:\n
+ firstConfigFiles \n
+ Config \ *it \:\n
+ thisConfigFiles \n;
+ this-LocalGenerator-IssueMessage(cmake::FATAL_ERROR, e.str());
+ return false;
+ }
+}
+ return true;
+}
+
[Cmake-commits] CMake branch, next, updated. v3.3.1-2518-g6792bac
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 6792bac389454c54660335f98f3a07163da17467 (commit)
via 59ebf292bbe8a039dd0530cd84e7b58448b3770c (commit)
from 12af1245ee99372e77d8ae50feb3cc25c33c8362 (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=6792bac389454c54660335f98f3a07163da17467
commit 6792bac389454c54660335f98f3a07163da17467
Merge: 12af124 59ebf29
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Aug 25 18:06:25 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Aug 25 18:06:25 2015 -0400
Merge topic 'use-generator-target' into next
59ebf292 fixup! cmGeneratorTarget: Move GetLanguages from cmTarget.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=59ebf292bbe8a039dd0530cd84e7b58448b3770c
commit 59ebf292bbe8a039dd0530cd84e7b58448b3770c
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Aug 26 00:06:08 2015 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Wed Aug 26 00:06:08 2015 +0200
fixup! cmGeneratorTarget: Move GetLanguages from cmTarget.
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx
b/Source/cmGlobalVisualStudioGenerator.cxx
index b422fdc..771d72d 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -836,10 +836,11 @@ void RegisterVisualStudioMacros(const std::string
macrosFile,
bool
cmGlobalVisualStudioGenerator::TargetIsFortranOnly(cmTarget const target)
{
+ cmGeneratorTarget* gt = this-GetGeneratorTarget(target);
+
// check to see if this is a fortran build
std::setstd::string languages;
{
- cmGeneratorTarget* gt = this-GetGeneratorTarget(target);
// Issue diagnostic if the source files depend on the config.
std::vectorcmSourceFile* sources;
---
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.1-2521-gc2182a3
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 c2182a307118524bf6bbe567dfff849e396ee796 (commit)
via 96b63ec87594298906b28adeac7d02da4859b097 (commit)
via 28edac28a33131410ecdb414fd00372925f9836d (commit)
from 6792bac389454c54660335f98f3a07163da17467 (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=c2182a307118524bf6bbe567dfff849e396ee796
commit c2182a307118524bf6bbe567dfff849e396ee796
Merge: 6792bac 96b63ec
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Aug 25 18:06:55 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Aug 25 18:06:55 2015 -0400
Merge topic 'use-generator-target' into next
96b63ec8 cmGeneratorTarget: Move GetConfigCommonSourceFiles from cmTarget.
28edac28 cmGeneratorTarget: Move GetLanguages from cmTarget.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96b63ec87594298906b28adeac7d02da4859b097
commit 96b63ec87594298906b28adeac7d02da4859b097
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Aug 5 17:37:50 2015 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Wed Aug 26 00:06:33 2015 +0200
cmGeneratorTarget: Move GetConfigCommonSourceFiles from cmTarget.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index e6507e7..5c83879 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4397,11 +4397,68 @@ cmGeneratorTarget::GetLinkImplementation(const
std::string config) const
}
//
+bool cmGeneratorTarget::GetConfigCommonSourceFiles(
+std::vectorcmSourceFile* files) const
+{
+ std::vectorstd::string configs;
+ this-Makefile-GetConfigurations(configs);
+ if (configs.empty())
+{
+configs.push_back();
+}
+
+ std::vectorstd::string::const_iterator it = configs.begin();
+ const std::string firstConfig = *it;
+ this-Target-GetSourceFiles(files, firstConfig);
+
+ for ( ; it != configs.end(); ++it)
+{
+std::vectorcmSourceFile* configFiles;
+this-Target-GetSourceFiles(configFiles, *it);
+if (configFiles != files)
+ {
+ std::string firstConfigFiles;
+ const char* sep = ;
+ for (std::vectorcmSourceFile*::const_iterator fi = files.begin();
+ fi != files.end(); ++fi)
+{
+firstConfigFiles += sep;
+firstConfigFiles += (*fi)-GetFullPath();
+sep = \n ;
+}
+
+ std::string thisConfigFiles;
+ sep = ;
+ for (std::vectorcmSourceFile*::const_iterator fi = configFiles.begin();
+ fi != configFiles.end(); ++fi)
+{
+thisConfigFiles += sep;
+thisConfigFiles += (*fi)-GetFullPath();
+sep = \n ;
+}
+ std::ostringstream e;
+ e Target \ this-GetName()
+ \ has source files which vary by
+configuration. This is not supported by the \
+ this-GlobalGenerator-GetName()
+ \ generator.\n
+ Config \ firstConfig \:\n
+ firstConfigFiles \n
+ Config \ *it \:\n
+ thisConfigFiles \n;
+ this-LocalGenerator-IssueMessage(cmake::FATAL_ERROR, e.str());
+ return false;
+ }
+}
+ return true;
+}
+
+//
void cmGeneratorTarget::GetLanguages(std::setstd::string languages,
const std::string config) const
{
std::vectorcmSourceFile* sourceFiles;
- this-Target-GetSourceFiles(sourceFiles, config);
+ this-GetSourceFiles(sourceFiles, config);
for(std::vectorcmSourceFile*::const_iterator
i = sourceFiles.begin(); i != sourceFiles.end(); ++i)
{
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index e7ec23a..6d66bfe 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -241,6 +241,8 @@ public:
void GetLanguages(std::setstd::string languages,
std::string const config) const;
+ bool GetConfigCommonSourceFiles(std::vectorcmSourceFile* files) const;
+
bool HaveBuildTreeRPATH(const std::string config) const;
/** Full path with trailing slash to the top-level directory
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx
b/Source/cmGlobalVisualStudioGenerator.cxx
index 6857cd2..771d72d 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -844,7 +844,7 @@ cmGlobalVisualStudioGenerator::TargetIsFortranOnly(cmTarget
const target)
// Issue diagnostic if the source files depend on the
[Cmake-commits] CMake branch, next, updated. v3.3.1-2526-gb847cf9
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 b847cf94af02e660f611e333e384d35c6c38f5c1 (commit)
via 5c88e5ff5584216463fdc9ec87a10829ca537f5b (commit)
via 927ceca89e5da76b142bd598fb460bd796caf889 (commit)
from 1e744a06addbbf60545c6bc29441810af552e9d6 (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=b847cf94af02e660f611e333e384d35c6c38f5c1
commit b847cf94af02e660f611e333e384d35c6c38f5c1
Merge: 1e744a0 5c88e5f
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Aug 25 18:08:59 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Aug 25 18:08:59 2015 -0400
Merge topic 'use-generator-target' into next
5c88e5ff cmGeneratorTarget: Move GetConfigCommonSourceFiles from cmTarget.
927ceca8 cmGeneratorTarget: Move GetLanguages from cmTarget.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c88e5ff5584216463fdc9ec87a10829ca537f5b
commit 5c88e5ff5584216463fdc9ec87a10829ca537f5b
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Aug 5 17:37:50 2015 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Wed Aug 26 00:08:23 2015 +0200
cmGeneratorTarget: Move GetConfigCommonSourceFiles from cmTarget.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index e6507e7..5c83879 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4397,11 +4397,68 @@ cmGeneratorTarget::GetLinkImplementation(const
std::string config) const
}
//
+bool cmGeneratorTarget::GetConfigCommonSourceFiles(
+std::vectorcmSourceFile* files) const
+{
+ std::vectorstd::string configs;
+ this-Makefile-GetConfigurations(configs);
+ if (configs.empty())
+{
+configs.push_back();
+}
+
+ std::vectorstd::string::const_iterator it = configs.begin();
+ const std::string firstConfig = *it;
+ this-Target-GetSourceFiles(files, firstConfig);
+
+ for ( ; it != configs.end(); ++it)
+{
+std::vectorcmSourceFile* configFiles;
+this-Target-GetSourceFiles(configFiles, *it);
+if (configFiles != files)
+ {
+ std::string firstConfigFiles;
+ const char* sep = ;
+ for (std::vectorcmSourceFile*::const_iterator fi = files.begin();
+ fi != files.end(); ++fi)
+{
+firstConfigFiles += sep;
+firstConfigFiles += (*fi)-GetFullPath();
+sep = \n ;
+}
+
+ std::string thisConfigFiles;
+ sep = ;
+ for (std::vectorcmSourceFile*::const_iterator fi = configFiles.begin();
+ fi != configFiles.end(); ++fi)
+{
+thisConfigFiles += sep;
+thisConfigFiles += (*fi)-GetFullPath();
+sep = \n ;
+}
+ std::ostringstream e;
+ e Target \ this-GetName()
+ \ has source files which vary by
+configuration. This is not supported by the \
+ this-GlobalGenerator-GetName()
+ \ generator.\n
+ Config \ firstConfig \:\n
+ firstConfigFiles \n
+ Config \ *it \:\n
+ thisConfigFiles \n;
+ this-LocalGenerator-IssueMessage(cmake::FATAL_ERROR, e.str());
+ return false;
+ }
+}
+ return true;
+}
+
+//
void cmGeneratorTarget::GetLanguages(std::setstd::string languages,
const std::string config) const
{
std::vectorcmSourceFile* sourceFiles;
- this-Target-GetSourceFiles(sourceFiles, config);
+ this-GetSourceFiles(sourceFiles, config);
for(std::vectorcmSourceFile*::const_iterator
i = sourceFiles.begin(); i != sourceFiles.end(); ++i)
{
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index e7ec23a..6d66bfe 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -241,6 +241,8 @@ public:
void GetLanguages(std::setstd::string languages,
std::string const config) const;
+ bool GetConfigCommonSourceFiles(std::vectorcmSourceFile* files) const;
+
bool HaveBuildTreeRPATH(const std::string config) const;
/** Full path with trailing slash to the top-level directory
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx
b/Source/cmGlobalVisualStudioGenerator.cxx
index 9b1f4c2..2bf04b4 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -843,7 +843,7 @@ cmGlobalVisualStudioGenerator::TargetIsFortranOnly(cmTarget
const target)
{
// Issue diagnostic if the source files depend on the
[Cmake-commits] CMake branch, next, updated. v3.3.1-2523-g1e744a0
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 1e744a06addbbf60545c6bc29441810af552e9d6 (commit)
via 4ffc76e24f669f0b6c0119fa2a64088983f4691b (commit)
from c2182a307118524bf6bbe567dfff849e396ee796 (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=1e744a06addbbf60545c6bc29441810af552e9d6
commit 1e744a06addbbf60545c6bc29441810af552e9d6
Merge: c2182a3 4ffc76e
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Aug 25 18:08:01 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Aug 25 18:08:01 2015 -0400
Merge topic 'use-generator-target' into next
4ffc76e2 fixup! cmGeneratorTarget: Move GetLanguages from cmTarget.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ffc76e24f669f0b6c0119fa2a64088983f4691b
commit 4ffc76e24f669f0b6c0119fa2a64088983f4691b
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Aug 26 00:07:34 2015 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Wed Aug 26 00:07:34 2015 +0200
fixup! cmGeneratorTarget: Move GetLanguages from cmTarget.
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx
b/Source/cmGlobalVisualStudioGenerator.cxx
index 771d72d..2bf04b4 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -841,7 +841,6 @@ cmGlobalVisualStudioGenerator::TargetIsFortranOnly(cmTarget
const target)
// check to see if this is a fortran build
std::setstd::string languages;
{
-
// Issue diagnostic if the source files depend on the config.
std::vectorcmSourceFile* sources;
if (!gt-GetConfigCommonSourceFiles(sources))
---
Summary of changes:
Source/cmGlobalVisualStudioGenerator.cxx |1 -
1 file changed, 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.1-2450-g849ccc5
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 849ccc59e315e64b2c2c98d79ba2108810c461ca (commit)
via 67f60958b61941264b0e2a63ad527dd346a6b1e3 (commit)
from d70e7e1491ec53571d1948c89cf658393ebee406 (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=849ccc59e315e64b2c2c98d79ba2108810c461ca
commit 849ccc59e315e64b2c2c98d79ba2108810c461ca
Merge: d70e7e1 67f6095
Author: Gregor Jasny gja...@googlemail.com
AuthorDate: Tue Aug 25 15:48:42 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Aug 25 15:48:42 2015 -0400
Merge topic 'apple-tbd-stubs' into next
67f60958 Darwin: Add support for tbd library stub files
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67f60958b61941264b0e2a63ad527dd346a6b1e3
commit 67f60958b61941264b0e2a63ad527dd346a6b1e3
Author: Gregor Jasny gja...@googlemail.com
AuthorDate: Sat Aug 15 21:01:31 2015 +0200
Commit: Gregor Jasny gja...@googlemail.com
CommitDate: Mon Aug 24 22:29:33 2015 +0200
Darwin: Add support for tbd library stub files
Starting with Xcode 7 the OSX and iOS SDKs contain only stub
files for dynamic system libraries. These stub files contain
some meta data and a list of exported sysbols in plain text.
They are handled by the toolchain like regular dylibs.
diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index 4e4810a..bb085ac 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -53,7 +53,7 @@ set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS -dynamiclib
-Wl,-headerpad_max_install_
set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS -bundle
-Wl,-headerpad_max_install_names)
set(CMAKE_SHARED_MODULE_LOADER_C_FLAG -Wl,-bundle_loader,)
set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG -Wl,-bundle_loader,)
-set(CMAKE_FIND_LIBRARY_SUFFIXES .dylib .so .a)
+set(CMAKE_FIND_LIBRARY_SUFFIXES .tbd .dylib .so .a)
# hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old
build tree
# (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL
isn't in the cache
diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
index ef81739..1151abf 100644
--- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
+++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
@@ -39,3 +39,9 @@ if(NOT XCODE_VERSION VERSION_LESS 5)
unset(RunCMake_TEST_NO_CLEAN)
unset(RunCMake_TEST_OPTIONS)
endif()
+
+if(NOT XCODE_VERSION VERSION_LESS 7)
+ set(RunCMake_TEST_OPTIONS
-DCMAKE_TOOLCHAIN_FILE=${RunCMake_SOURCE_DIR}/osx.cmake)
+ run_cmake(XcodeTbdStub)
+ unset(RunCMake_TEST_OPTIONS)
+endif()
diff --git a/Tests/RunCMake/XcodeProject/XcodeTbdStub-stdout.txt
b/Tests/RunCMake/XcodeProject/XcodeTbdStub-stdout.txt
new file mode 100644
index 000..9d9e143
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodeTbdStub-stdout.txt
@@ -0,0 +1 @@
+.*/libz\.tbd.*
diff --git a/Tests/RunCMake/XcodeProject/XcodeTbdStub.cmake
b/Tests/RunCMake/XcodeProject/XcodeTbdStub.cmake
new file mode 100644
index 000..e83d7f3
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodeTbdStub.cmake
@@ -0,0 +1,2 @@
+cmake_minimum_required(VERSION 3.3)
+find_package(ZLIB REQUIRED)
diff --git a/Tests/RunCMake/XcodeProject/osx.cmake
b/Tests/RunCMake/XcodeProject/osx.cmake
new file mode 100644
index 000..e021fcd
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/osx.cmake
@@ -0,0 +1,18 @@
+set(CMAKE_SYSTEM_NAME Darwin)
+set(CMAKE_SYSTEM_VERSION 1)
+set(UNIX True)
+set(APPLE True)
+
+find_program(XCRUN_EXECUTABLE xcrun)
+if(NOT XCRUN_EXECUTABLE)
+ message(FATAL_ERROR xcrun not found)
+endif()
+
+execute_process(
+ COMMAND ${XCRUN_EXECUTABLE} --sdk macosx --show-sdk-path
+ OUTPUT_VARIABLE OSX_SDK_PATH
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+set(CMAKE_OSX_SYSROOT ${OSX_SDK_PATH} CACHE PATH Sysroot used for OSX
support)
+
+set(CMAKE_FIND_ROOT_PATH ${OSX_SDK_PATH} CACHE PATH Find search path root)
---
Summary of changes:
Modules/Platform/Darwin.cmake |2 +-
Tests/RunCMake/XcodeProject/RunCMakeTest.cmake |6 ++
Tests/RunCMake/XcodeProject/XcodeTbdStub-stdout.txt |1 +
Tests/RunCMake/XcodeProject/XcodeTbdStub.cmake |2 ++
Tests/RunCMake/XcodeProject/osx.cmake | 18 ++
5 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 Tests/RunCMake/XcodeProject/XcodeTbdStub-stdout.txt
create mode 100644 Tests/RunCMake/XcodeProject/XcodeTbdStub.cmake
create mode 100644
[Cmake-commits] CMake branch, next, updated. v3.3.1-2490-g9bfcb9d
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 9bfcb9d4edc48a47beff5bdeb0e476012ef3fce9 (commit)
via 7f551b4f2635816553c2ff7dacef78254875116e (commit)
via cd6293cdf8cf04fca70497a2474989b773fe922e (commit)
via de6b2895824fdac9a25fa9cd2f0f7c38b29547dc (commit)
via e35ee02d6e6aa5d1e9bc50d7c378dcbbabcf52bd (commit)
via 00f2298f0788404cf170ed6ab50b73ef890b4302 (commit)
via 6254ba95784ae29616b17ad8b42d4f31560c2c65 (commit)
via cf0a78dc4ce7debb62ceb4d12235ea75e19bebe2 (commit)
from f91dd93d9afdb02268c285214abed9d8cc50f191 (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=9bfcb9d4edc48a47beff5bdeb0e476012ef3fce9
commit 9bfcb9d4edc48a47beff5bdeb0e476012ef3fce9
Merge: f91dd93 7f551b4
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Aug 25 17:12:07 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Aug 25 17:12:07 2015 -0400
Merge topic 'minor-cleanups' into next
7f551b4f cmGlobalGenerator: Implement VS6 check without virtual method.
cd6293cd cmMakefile: Fix style.
de6b2895 cmTarget: Remove vestigal method declaration.
e35ee02d cmTarget: Fix indentation.
00f2298f Reduce uses of cmMakefile::GetGlobalGenerator.
6254ba95 cmMakefile: Remove Internal class.
cf0a78dc cmGeneratorTarget: Issue messages through the local generator.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f551b4f2635816553c2ff7dacef78254875116e
commit 7f551b4f2635816553c2ff7dacef78254875116e
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Mon Aug 24 09:08:29 2015 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Aug 25 23:06:33 2015 +0200
cmGlobalGenerator: Implement VS6 check without virtual method.
Don't require existence of a global generator for this check.
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index fe710f1..3403cf9 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -242,7 +242,7 @@ public:
#if defined(_WIN32) !defined(__CYGWIN__)
/** Is this the Visual Studio 6 generator? */
- virtual bool IsForVS6() const { return false; }
+ bool IsForVS6() const { return this-GetName() == Visual Studio 6; }
#endif
///! Find a target by name by searching the local generators.
diff --git a/Source/cmGlobalVisualStudio6Generator.h
b/Source/cmGlobalVisualStudio6Generator.h
index 2460158..420cb0b 100644
--- a/Source/cmGlobalVisualStudio6Generator.h
+++ b/Source/cmGlobalVisualStudio6Generator.h
@@ -85,8 +85,6 @@ public:
virtual void FindMakeProgram(cmMakefile*);
- virtual bool IsForVS6() const { return true; }
-
protected:
virtual void Generate();
virtual const char* GetIDEVersion() { return 6.0; }
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cd6293cdf8cf04fca70497a2474989b773fe922e
commit cd6293cdf8cf04fca70497a2474989b773fe922e
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Mon Aug 24 07:45:26 2015 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Aug 25 23:06:33 2015 +0200
cmMakefile: Fix style.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 3289881..1550c7b 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2072,7 +2072,8 @@ void cmMakefile::AddGlobalLinkInformation(const
std::string name,
if(std::find(this-LinkDirectories.begin(),
this-LinkDirectories.end(), newdir)
== this-LinkDirectories.end())
-{target.AddLinkDirectory(*j);
+{
+target.AddLinkDirectory(*j);
}
}
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=de6b2895824fdac9a25fa9cd2f0f7c38b29547dc
commit de6b2895824fdac9a25fa9cd2f0f7c38b29547dc
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Aug 25 07:24:45 2015 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Aug 25 23:06:33 2015 +0200
cmTarget: Remove vestigal method declaration.
The definition was removed in commit v3.1.0-rc1~688^2~5 (cmTarget:
Allow any generator expression in SOURCES property., 2014-03-18).
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 2007b40..dccf550 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -614,8 +614,6 @@ private:
void MaybeInvalidatePropertyCache(const std::string prop);
- void ProcessSourceExpression(std::string const expr);
-
// Internal representation details.
friend class cmTargetInternals;
friend class cmGeneratorTarget;
[Cmake-commits] CMake branch, next, updated. v3.3.1-2493-g0c1b27f
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 0c1b27f050d3890cef1fd621a36cc53bd9dda7b7 (commit)
via 87892dcb3dbaf65489caacf2e5eb2a5a26b711a6 (commit)
via 873c9f072c79bc6a80fe5acb8c0386665cf979ef (commit)
from 9bfcb9d4edc48a47beff5bdeb0e476012ef3fce9 (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=0c1b27f050d3890cef1fd621a36cc53bd9dda7b7
commit 0c1b27f050d3890cef1fd621a36cc53bd9dda7b7
Merge: 9bfcb9d 87892dc
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Aug 25 17:26:29 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Aug 25 17:26:29 2015 -0400
Merge topic 'use-generator-target' into next
87892dcb simplify.
873c9f07 simplify
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87892dcb3dbaf65489caacf2e5eb2a5a26b711a6
commit 87892dcb3dbaf65489caacf2e5eb2a5a26b711a6
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Aug 25 23:26:01 2015 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Aug 25 23:26:06 2015 +0200
simplify.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 9fb8375..5c83879 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4440,7 +4440,7 @@ bool cmGeneratorTarget::GetConfigCommonSourceFiles(
e Target \ this-GetName()
\ has source files which vary by
configuration. This is not supported by the \
- this-LocalGenerator-GetGlobalGenerator()-GetName()
+ this-GlobalGenerator-GetName()
\ generator.\n
Config \ firstConfig \:\n
firstConfigFiles \n
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=873c9f072c79bc6a80fe5acb8c0386665cf979ef
commit 873c9f072c79bc6a80fe5acb8c0386665cf979ef
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Aug 25 23:25:18 2015 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Aug 25 23:25:56 2015 +0200
simplify
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 9390b92..9fb8375 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4479,7 +4479,7 @@ void
cmGeneratorTarget::GetLanguages(std::setstd::string languages,
for (std::vectorcmTarget*::const_iterator it = objectTargets.begin();
it != objectTargets.end(); ++it)
{
- objectLibraries.push_back(this-LocalGenerator-GetGlobalGenerator()
+ objectLibraries.push_back(this-GlobalGenerator
-GetGeneratorTarget(*it));
}
}
@@ -4492,7 +4492,7 @@ void
cmGeneratorTarget::GetLanguages(std::setstd::string languages,
std::string objLib = (*i)-GetObjectLibrary();
if (cmTarget* tgt = this-Makefile-FindTargetToUse(objLib))
{
-objectLibraries.push_back(this-LocalGenerator-GetGlobalGenerator()
+objectLibraries.push_back(this-GlobalGenerator
-GetGeneratorTarget(tgt));
}
}
---
Summary of changes:
Source/cmGeneratorTarget.cxx |6 +++---
1 file changed, 3 insertions(+), 3 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, next, updated. v3.3.1-2503-gd680282
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 d680282224da579f124c8b26efb71b70db87fd47 (commit)
via aeeed727d50330deef90ef09c24639fa62f3010d (commit)
via 4836df6df1c01a46d75c8c32cae1fc51bd0332cd (commit)
via 2617827b99961436ef7fe7ea4cb50cfc4c5fc203 (commit)
via f5e9a738f976e8793bbae348f9535e64b9022e47 (commit)
via ece6945b9d40fb47c3ac1070db9e1b46739b6448 (commit)
via e4e4417bec7b089637832a4026a5130aa99da587 (commit)
from b3ee076f10eeaa5fcfb01d7e90820bdccbd3d397 (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=d680282224da579f124c8b26efb71b70db87fd47
commit d680282224da579f124c8b26efb71b70db87fd47
Merge: b3ee076 aeeed72
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Aug 25 17:43:09 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Aug 25 17:43:09 2015 -0400
Merge topic 'use-generator-target' into next
aeeed727 fix sources
4836df6d languages
2617827b fix compute
f5e9a738 compile-options
ece6945b include-directories
e4e4417b compile-definitions
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aeeed727d50330deef90ef09c24639fa62f3010d
commit aeeed727d50330deef90ef09c24639fa62f3010d
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Aug 25 23:41:24 2015 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Aug 25 23:42:54 2015 +0200
fix sources
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx
b/Source/cmGlobalVisualStudioGenerator.cxx
index 84fdcad..b422fdc 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -843,7 +843,7 @@ cmGlobalVisualStudioGenerator::TargetIsFortranOnly(cmTarget
const target)
// Issue diagnostic if the source files depend on the config.
std::vectorcmSourceFile* sources;
- if (!target.GetConfigCommonSourceFiles(sources))
+ if (!gt-GetConfigCommonSourceFiles(sources))
{
return false;
}
diff --git a/Source/cmLocalVisualStudio6Generator.cxx
b/Source/cmLocalVisualStudio6Generator.cxx
index 0d07536..3a44367 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -305,9 +305,12 @@ void
cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream fout,
// We may be modifying the source groups temporarily, so make a copy.
std::vectorcmSourceGroup sourceGroups = this-Makefile-GetSourceGroups();
+ cmGeneratorTarget* gt =
+this-GlobalGenerator-GetGeneratorTarget(target);
+
// get the classes from the source lists then add them to the groups
std::vectorcmSourceFile* classes;
- if (!target.GetConfigCommonSourceFiles(classes))
+ if (!gt-GetConfigCommonSourceFiles(classes))
{
return;
}
diff --git a/Source/cmLocalVisualStudio7Generator.cxx
b/Source/cmLocalVisualStudio7Generator.cxx
index f17c9a4..55ad852 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1469,10 +1469,13 @@ void
cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream fout,
// We may be modifying the source groups temporarily, so make a copy.
std::vectorcmSourceGroup sourceGroups = this-Makefile-GetSourceGroups();
+ cmGeneratorTarget* gt =
+this-GlobalGenerator-GetGeneratorTarget(target);
+
// get the classes from the source lists then add them to the groups
this-ModuleDefinitionFile = ;
std::vectorcmSourceFile* classes;
- if (!target.GetConfigCommonSourceFiles(classes))
+ if (!gt-GetConfigCommonSourceFiles(classes))
{
return;
}
@@ -1514,8 +1517,6 @@ void
cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream fout,
{
// VS = 8 support per-config source locations so we
// list object library content as external objects.
-cmGeneratorTarget* gt =
- this-GlobalGenerator-GetGeneratorTarget(target);
std::vectorstd::string objs;
gt-UseObjectLibraries(objs, );
if(!objs.empty())
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index 464a83a..e7716d8 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -965,7 +965,7 @@ void cmVisualStudio10TargetGenerator::WriteGroups()
std::vectorcmSourceGroup sourceGroups =
this-Makefile-GetSourceGroups();
std::vectorcmSourceFile* classes;
- if (!this-Target-GetConfigCommonSourceFiles(classes))
+ if (!this-GeneratorTarget-GetConfigCommonSourceFiles(classes))
{
return;
}
[Cmake-commits] CMake branch, next, updated. v3.3.1-2496-gb3ee076
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 b3ee076f10eeaa5fcfb01d7e90820bdccbd3d397 (commit)
via 976bdbf6a94dedb41a7988bff83153173faf043b (commit)
via 06c2a30f336d417964cabae520885eb4eee5d77e (commit)
from 0c1b27f050d3890cef1fd621a36cc53bd9dda7b7 (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=b3ee076f10eeaa5fcfb01d7e90820bdccbd3d397
commit b3ee076f10eeaa5fcfb01d7e90820bdccbd3d397
Merge: 0c1b27f 976bdbf
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Aug 25 17:27:20 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Aug 25 17:27:20 2015 -0400
Merge topic 'use-generator-target' into next
976bdbf6 cmGeneratorTarget: Move GetConfigCommonSourceFiles from cmTarget.
06c2a30f cmGeneratorTarget: Move GetLanguages from cmTarget.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=976bdbf6a94dedb41a7988bff83153173faf043b
commit 976bdbf6a94dedb41a7988bff83153173faf043b
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Aug 5 17:37:50 2015 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Tue Aug 25 23:26:45 2015 +0200
cmGeneratorTarget: Move GetConfigCommonSourceFiles from cmTarget.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index e6507e7..5c83879 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -4397,11 +4397,68 @@ cmGeneratorTarget::GetLinkImplementation(const
std::string config) const
}
//
+bool cmGeneratorTarget::GetConfigCommonSourceFiles(
+std::vectorcmSourceFile* files) const
+{
+ std::vectorstd::string configs;
+ this-Makefile-GetConfigurations(configs);
+ if (configs.empty())
+{
+configs.push_back();
+}
+
+ std::vectorstd::string::const_iterator it = configs.begin();
+ const std::string firstConfig = *it;
+ this-Target-GetSourceFiles(files, firstConfig);
+
+ for ( ; it != configs.end(); ++it)
+{
+std::vectorcmSourceFile* configFiles;
+this-Target-GetSourceFiles(configFiles, *it);
+if (configFiles != files)
+ {
+ std::string firstConfigFiles;
+ const char* sep = ;
+ for (std::vectorcmSourceFile*::const_iterator fi = files.begin();
+ fi != files.end(); ++fi)
+{
+firstConfigFiles += sep;
+firstConfigFiles += (*fi)-GetFullPath();
+sep = \n ;
+}
+
+ std::string thisConfigFiles;
+ sep = ;
+ for (std::vectorcmSourceFile*::const_iterator fi = configFiles.begin();
+ fi != configFiles.end(); ++fi)
+{
+thisConfigFiles += sep;
+thisConfigFiles += (*fi)-GetFullPath();
+sep = \n ;
+}
+ std::ostringstream e;
+ e Target \ this-GetName()
+ \ has source files which vary by
+configuration. This is not supported by the \
+ this-GlobalGenerator-GetName()
+ \ generator.\n
+ Config \ firstConfig \:\n
+ firstConfigFiles \n
+ Config \ *it \:\n
+ thisConfigFiles \n;
+ this-LocalGenerator-IssueMessage(cmake::FATAL_ERROR, e.str());
+ return false;
+ }
+}
+ return true;
+}
+
+//
void cmGeneratorTarget::GetLanguages(std::setstd::string languages,
const std::string config) const
{
std::vectorcmSourceFile* sourceFiles;
- this-Target-GetSourceFiles(sourceFiles, config);
+ this-GetSourceFiles(sourceFiles, config);
for(std::vectorcmSourceFile*::const_iterator
i = sourceFiles.begin(); i != sourceFiles.end(); ++i)
{
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index e7ec23a..6d66bfe 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -241,6 +241,8 @@ public:
void GetLanguages(std::setstd::string languages,
std::string const config) const;
+ bool GetConfigCommonSourceFiles(std::vectorcmSourceFile* files) const;
+
bool HaveBuildTreeRPATH(const std::string config) const;
/** Full path with trailing slash to the top-level directory
diff --git a/Source/cmGlobalXCodeGenerator.cxx
b/Source/cmGlobalXCodeGenerator.cxx
index b70f3c9..756daa0 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1124,7 +1124,7 @@
cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
// organize the sources
std::vectorcmSourceFile* classes;
-if
[Cmake-commits] CMake branch, next, updated. v3.3.1-2433-g7b03a6b
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 7b03a6bd559fdfabf7bab274cb3f99f9bc212edc (commit)
via 7a64f35d714da66a43a22e8501a2cec383e04025 (commit)
via 1c9e979cb8839e59d5e33bb9dd0d3316ac7403ca (commit)
from 50e7fa615cfcb63b337640d353fc153a74ac1fde (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=7b03a6bd559fdfabf7bab274cb3f99f9bc212edc
commit 7b03a6bd559fdfabf7bab274cb3f99f9bc212edc
Merge: 50e7fa6 7a64f35
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Aug 25 09:46:31 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Aug 25 09:46:31 2015 -0400
Merge topic 'vs-store-phone-cert-thumbs' into next
7a64f35d fixup! VS: Windows Store/Phone package cert thumbprint
1c9e979c fixup! VS: Windows Store/Phone package cert thumbprint
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a64f35d714da66a43a22e8501a2cec383e04025
commit 7a64f35d714da66a43a22e8501a2cec383e04025
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Aug 25 09:46:19 2015 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Aug 25 09:46:19 2015 -0400
fixup! VS: Windows Store/Phone package cert thumbprint
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 3780ec0..583e1d0 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1041,7 +1041,7 @@ std::string cmSystemTools::ComputeCertificateThumbprint(
certData = new BYTE[fileSize];
if (certData != NULL)
{
-DWORD dwRead = NULL;
+DWORD dwRead = 0;
if (ReadFile(certFile, certData, fileSize, dwRead, NULL))
{
cryptBlob.cbData = fileSize;
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c9e979cb8839e59d5e33bb9dd0d3316ac7403ca
commit 1c9e979cb8839e59d5e33bb9dd0d3316ac7403ca
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Aug 25 09:21:04 2015 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Aug 25 09:21:04 2015 -0400
fixup! VS: Windows Store/Phone package cert thumbprint
diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in
index f29ac70..d3cff51 100644
--- a/CTestCustom.cmake.in
+++ b/CTestCustom.cmake.in
@@ -32,6 +32,7 @@ set(CTEST_CUSTOM_WARNING_EXCEPTION
remark: .*LOOP WAS VECTORIZED
warning .980: wrong number of actual arguments to intrinsic function
.std::basic_
LINK : warning LNK4089: all references to.*ADVAPI32.dll.*discarded by
/OPT:REF
+ LINK : warning LNK4089: all references to.*CRYPT32.dll.*discarded by
/OPT:REF
LINK : warning LNK4089: all references to.*PSAPI.DLL.*discarded by /OPT:REF
LINK : warning LNK4089: all references to.*RPCRT4.dll.*discarded by
/OPT:REF
LINK : warning LNK4089: all references to.*SHELL32.dll.*discarded by
/OPT:REF
---
Summary of changes:
CTestCustom.cmake.in |1 +
Source/cmSystemTools.cxx |2 +-
2 files 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.1-2435-gf23c21d
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 f23c21d028ecebc11ac724ea663d783eb477f4f8 (commit)
via 290b0f94b597f5a833f59cc8f70f1627bf8d1aa9 (commit)
from 7b03a6bd559fdfabf7bab274cb3f99f9bc212edc (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=f23c21d028ecebc11ac724ea663d783eb477f4f8
commit f23c21d028ecebc11ac724ea663d783eb477f4f8
Merge: 7b03a6b 290b0f9
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Aug 25 09:47:27 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Aug 25 09:47:27 2015 -0400
Merge topic 'FindJNI-suse-and-ibm' into next
290b0f94 FindJNI: Add support for SuSE platform and IBM Java SDK
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=290b0f94b597f5a833f59cc8f70f1627bf8d1aa9
commit 290b0f94b597f5a833f59cc8f70f1627bf8d1aa9
Author: Marc Chevrier marc.chevr...@sap.com
AuthorDate: Tue Aug 25 09:31:30 2015 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Aug 25 09:47:05 2015 -0400
FindJNI: Add support for SuSE platform and IBM Java SDK
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index d31fea3..6958a2a 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -156,6 +156,9 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
/usr/local/jre-1.7.0/lib/{libarch}
/usr/local/jdk-1.6.0/jre/lib/{libarch}
/usr/local/jre-1.6.0/lib/{libarch}
+ # SuSE specific paths for default JVM
+ /usr/lib64/jvm/java/jre/lib/{libarch}
+ /usr/lib64/jvm/jre/lib/{libarch}
)
set(JAVA_JVM_LIBRARY_DIRECTORIES)
@@ -164,6 +167,9 @@ foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
${dir}
${dir}/client
${dir}/server
+# IBM SDK, Java Technology Edition, specific paths
+${dir}/j9vm
+${dir}/default
)
endforeach()
@@ -193,6 +199,8 @@ list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES
# OpenBSD specific path for default JVM
/usr/local/jdk-1.7.0/include
/usr/local/jdk-1.6.0/include
+ # SuSE specific paths for default JVM
+ /usr/lib64/jvm/java/include
)
foreach(JAVA_PROG ${JAVA_RUNTIME} ${JAVA_COMPILE} ${JAVA_ARCHIVE})
---
Summary of changes:
Modules/FindJNI.cmake |8
1 file changed, 8 insertions(+)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
