[Cmake-commits] CMake branch, master, updated. v3.4.0-rc2-361-gd288b21
Brad King
brad.king at kitware.com
Mon Oct 26 13:13:07 EDT 2015
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 d288b216af6864567354ccb05e85466fb57d46b0 (commit)
via 6cac952b9ed8ad202286ddee7246d9ef7ed8f22d (commit)
via 97b3768898431ffff824388dc263654a35a33aa2 (commit)
via 600af01d41e32d304e43dc98783ec0f7f010f40e (commit)
via 330bfa83368989f6fd67072ef9f5c9e457230f17 (commit)
via b13e26e278dcc34243a2b31dfca8e23b01e15b76 (commit)
via 8ac8739b2e5df2f36194261f9dcac95107b4b5f7 (commit)
via 84fb579fc8935202bf182bbd1685aff6acc2a3b5 (commit)
via 1eff421ad00bd26a22b5145fe2b175a300041dca (commit)
via 94fd5a5af87adafbbf7f47d6d083b53c6bd3e941 (commit)
via ce9e9a92cf773280de55ef6dcbec9fc2524f7b2e (commit)
via 26e23e8463f9b9e2298e317a70925c56bcb018d1 (commit)
via 01c26986931a409dbb246b780b808c51aea35c2b (commit)
via 459c891088c8b2fb8b7cb950878cf7c0579ddb33 (commit)
via 7f8bb857b8ab714b80acfa6a6e2c34195fabff6f (commit)
via a0ebd69b52dea77c5d8c718bcb7ba0c75ceb9d5f (commit)
via bcee21ceb733d7e6d12d85346d8e683399cc4fc4 (commit)
via b74aa0e3d2eb90b83bbbdcc91e0b1dd721cd194f (commit)
via b92d0b2c94936fa438c8c92a6961b6323795d6f9 (commit)
via 05982b26e6fc58422dd4c05497466f206d6c93f7 (commit)
via effe874d25cc0448d9f37fd90283fb83118cb31e (commit)
via 8616d12cfc868492c030168c228983cf6b22b534 (commit)
via ed4ea59a33d094245ff4807c143134846b2be77a (commit)
via 634155d6952033f353de90073ac58ef53a900306 (commit)
via 4bc65d76f13c63367857b22e87f73baa8e6d5970 (commit)
via 80de856bb5cba20d424b91e4a49fe8fdb1f904a3 (commit)
via 4c41e74da58b6f1057466e7eaa22942dc62c8802 (commit)
via 67b2f4312c431eb363dd94a2bb5d88cc6c8a7c95 (commit)
via f528e6bcb9b2e181dcd7ee0c1cc327b6cad84ad5 (commit)
via a6b7eb5bc8c304dab2102689eb09ec85c1e7f6be (commit)
via c2c239e607549d6513d95c3e919b4f509733bc87 (commit)
via a8c0fbcc194bca6986492278e705ff301f283378 (commit)
from d71920c45763fe15fa93c2fc1f5aceabba23975e (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d288b216af6864567354ccb05e85466fb57d46b0
commit d288b216af6864567354ccb05e85466fb57d46b0
Merge: d71920c 6cac952
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 26 13:13:04 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 26 13:13:04 2015 -0400
Merge topic 'use-generator-target'
6cac952b VS: Port interface to cmGeneratorTarget
97b37688 VS: Port WriteUtilityDepends to cmGeneratorTarget
600af01d VS: Port utility depends to cmGeneratorTarget
330bfa83 VS: Port target depends to cmGeneratorTarget
b13e26e2 VS: Port ProjectDepends to cmGeneratorTarget.
8ac8739b VS: Port TargetIsFortranOnly to cmGeneratorTarget
84fb579f VS: Port WriteProject to cmGeneratorTarget
1eff421a VS: Port loop to cmGeneratorTarget
94fd5a5a VS: Port ImplibDir to cmGeneratorTarget
ce9e9a92 VS: Port LinkClosure to cmGeneratorTarget
26e23e84 VS: Port ComputeLongestObjectDirectory to cmGeneratorTarget
01c26986 VS7: Port to cmGeneratorTarget
459c8910 VS10: Port to cmGeneratorTarget.
7f8bb857 VS6: Port to cmGeneratorTarget.
a0ebd69b Graphviz: Port to cmGeneratorTarget.
bcee21ce C::B: Port API to cmGeneratorTarget.
...
diff --cc Source/cmGlobalXCodeGenerator.cxx
index 576827c,9111a3f..eecc82b
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@@ -1617,42 -1619,9 +1619,42 @@@ std::string cmGlobalXCodeGenerator::Ext
}
//----------------------------------------------------------------------------
+// This function removes each matching occurrence of the expression and
+// returns the last one (i.e., the dominant flag in GCC)
+std::string cmGlobalXCodeGenerator::ExtractFlagRegex(const char* exp,
+ int matchIndex,
+ std::string& flags)
+{
+ std::string retFlag;
+
+ cmsys::RegularExpression regex(exp);
+ assert(regex.is_valid());
+ if(!regex.is_valid())
+ {
+ return retFlag;
+ }
+
+ std::string::size_type offset = 0;
+
+ while(regex.find(flags.c_str() + offset))
+ {
+ const std::string::size_type startPos = offset + regex.start(matchIndex);
+ const std::string::size_type endPos = offset + regex.end(matchIndex);
+ const std::string::size_type size = endPos - startPos;
+
+ offset = startPos + 1;
+
+ retFlag.assign(flags, startPos, size);
+ flags.replace(startPos, size, size, ' ');
+ }
+
+ return retFlag;
+}
+
+//----------------------------------------------------------------------------
void
cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
- cmTarget& target,
+ cmGeneratorTarget* target,
std::vector<cmCustomCommand>
const & commands,
const char* name)
-----------------------------------------------------------------------
Summary of changes:
Source/cmCommonTargetGenerator.cxx | 4 +-
Source/cmCommonTargetGenerator.h | 2 -
Source/cmComputeTargetDepends.cxx | 9 +-
Source/cmExportFileGenerator.cxx | 12 +-
Source/cmExtraCodeBlocksGenerator.cxx | 49 ++-
Source/cmExtraCodeBlocksGenerator.h | 5 +-
Source/cmExtraCodeLiteGenerator.cxx | 11 +-
Source/cmExtraEclipseCDT4Generator.cxx | 56 ++--
Source/cmExtraKateGenerator.cxx | 31 +-
Source/cmExtraSublimeTextGenerator.cxx | 37 ++-
Source/cmExtraSublimeTextGenerator.h | 3 +-
Source/cmGeneratorTarget.cxx | 8 +-
Source/cmGeneratorTarget.h | 11 +-
Source/cmGhsMultiTargetGenerator.cxx | 56 ++--
Source/cmGhsMultiTargetGenerator.h | 11 +-
Source/cmGlobalGenerator.cxx | 61 ++--
Source/cmGlobalGenerator.h | 4 +
Source/cmGlobalGhsMultiGenerator.cxx | 23 +-
Source/cmGlobalGhsMultiGenerator.h | 4 +-
Source/cmGlobalKdevelopGenerator.cxx | 20 +-
Source/cmGlobalNinjaGenerator.cxx | 27 +-
Source/cmGlobalNinjaGenerator.h | 12 +-
Source/cmGlobalUnixMakefileGenerator3.cxx | 79 +++--
Source/cmGlobalUnixMakefileGenerator3.h | 6 +-
Source/cmGlobalVisualStudio10Generator.cxx | 12 +-
Source/cmGlobalVisualStudio10Generator.h | 4 +-
Source/cmGlobalVisualStudio6Generator.cxx | 25 +-
Source/cmGlobalVisualStudio6Generator.h | 6 +-
Source/cmGlobalVisualStudio71Generator.cxx | 12 +-
Source/cmGlobalVisualStudio71Generator.h | 4 +-
Source/cmGlobalVisualStudio7Generator.cxx | 38 +--
Source/cmGlobalVisualStudio7Generator.h | 9 +-
Source/cmGlobalVisualStudio8Generator.cxx | 15 +-
Source/cmGlobalVisualStudio8Generator.h | 5 +-
Source/cmGlobalVisualStudioGenerator.cxx | 100 +++---
Source/cmGlobalVisualStudioGenerator.h | 32 +-
Source/cmGlobalXCodeGenerator.cxx | 400 ++++++++++++------------
Source/cmGlobalXCodeGenerator.h | 43 ++-
Source/cmGraphVizWriter.cxx | 52 ++-
Source/cmGraphVizWriter.h | 7 +-
Source/cmInstallTargetGenerator.cxx | 7 +-
Source/cmLocalGenerator.cxx | 58 ++--
Source/cmLocalGenerator.h | 7 +-
Source/cmLocalGhsMultiGenerator.cxx | 10 +-
Source/cmLocalNinjaGenerator.cxx | 20 +-
Source/cmLocalNinjaGenerator.h | 9 +-
Source/cmLocalUnixMakefileGenerator3.cxx | 93 +++---
Source/cmLocalUnixMakefileGenerator3.h | 13 +-
Source/cmLocalVisualStudio10Generator.cxx | 13 +-
Source/cmLocalVisualStudio6Generator.cxx | 333 ++++++++++----------
Source/cmLocalVisualStudio6Generator.h | 29 +-
Source/cmLocalVisualStudio7Generator.cxx | 251 +++++++--------
Source/cmLocalVisualStudio7Generator.h | 32 +-
Source/cmLocalVisualStudioGenerator.cxx | 14 +-
Source/cmLocalVisualStudioGenerator.h | 6 +-
Source/cmMakefileExecutableTargetGenerator.cxx | 16 +-
Source/cmMakefileLibraryTargetGenerator.cxx | 19 +-
Source/cmMakefileTargetGenerator.cxx | 5 +-
Source/cmMakefileTargetGenerator.h | 2 -
Source/cmMakefileUtilityTargetGenerator.cxx | 11 +-
Source/cmNinjaNormalTargetGenerator.cxx | 36 +--
Source/cmNinjaTargetGenerator.cxx | 11 +-
Source/cmNinjaTargetGenerator.h | 5 +-
Source/cmNinjaUtilityTargetGenerator.cxx | 16 +-
Source/cmQtAutoGeneratorInitializer.cxx | 2 +-
Source/cmTarget.h | 4 +
Source/cmVisualStudio10TargetGenerator.cxx | 49 +--
Source/cmVisualStudio10TargetGenerator.h | 4 +-
Source/cmXCodeObject.h | 8 +-
69 files changed, 1196 insertions(+), 1192 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list