[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2619-gc043669
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 c0436698786f2c196ed2849a6904d269b51db5f9 (commit)
via cfe6300a41392b79d95774c2778d33a55deaed48 (commit)
via 82771f186220b45a9aaf10ed416f1df135e56c36 (commit)
from 349ce8462282c2036b427aa3d790ff97955c861f (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=c0436698786f2c196ed2849a6904d269b51db5f9
commit c0436698786f2c196ed2849a6904d269b51db5f9
Merge: 349ce84 cfe6300
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Jun 14 08:15:55 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jun 14 08:15:55 2013 -0400
Merge topic 'vs-TargetFrameworkVersion' into next
cfe6300 VS: Add support for .NET target framework version
82771f1 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cfe6300a41392b79d95774c2778d33a55deaed48
commit cfe6300a41392b79d95774c2778d33a55deaed48
Author: Christian Maaser christian.maa...@thalesgroup.com
AuthorDate: Fri Jun 14 07:28:00 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Jun 14 08:09:00 2013 -0400
VS: Add support for .NET target framework version
Teach CMake to generate the TargetFrameworkVersion XML node as
documented at
http://msdn.microsoft.com/en-us/library/vstudio/ff770576.aspx
from target property VS_DOTNET_TARGET_FRAMEWORK_VERSION.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 7d25b91..b14db43 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1403,6 +1403,11 @@ void cmTarget::DefineProperties(cmake *cm)
Sets the \RootNamespace\ attribute for a generated Visual Studio
project. The attribute will be generated only if this is set.);
cm-DefineProperty
+(VS_DOTNET_TARGET_FRAMEWORK_VERSION, cmProperty::TARGET,
+ Specify the .NET target framework version.,
+ Used to specify the .NET target framework version for C++/CLI.
+ For example, \v4.5\.);
+ cm-DefineProperty
(VS_DOTNET_REFERENCES, cmProperty::TARGET,
Visual Studio managed project .NET references,
Adds one or more semicolon-delimited .NET references to a
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index f8de3a8..2c9ec8e 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -280,6 +280,13 @@ void cmVisualStudio10TargetGenerator::Generate()
}
this-WriteString(ProjectName, 2);
(*this-BuildFileStream) projLabel /ProjectName\n;
+ if(const char* targetFrameworkVersion = this-Target-GetProperty(
+ VS_DOTNET_TARGET_FRAMEWORK_VERSION))
+{
+this-WriteString(TargetFrameworkVersion, 2);
+(*this-BuildFileStream) targetFrameworkVersion
+ /TargetFrameworkVersion\n;
+}
this-WriteString(/PropertyGroup\n, 1);
this-WriteString(Import Project=
\$(VCTargetsPath)\\Microsoft.Cpp.Default.props\ /\n,
---
Summary of changes:
Source/CMakeVersion.cmake |2 +-
Source/cmTarget.cxx|5 +
Source/cmVisualStudio10TargetGenerator.cxx |7 +++
3 files changed, 13 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2621-g9022081
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 902208172455e347099199f0382fb230bbdb593a (commit)
via dc03499595086ec190d55c59c8589c112362dbb6 (commit)
from c0436698786f2c196ed2849a6904d269b51db5f9 (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=902208172455e347099199f0382fb230bbdb593a
commit 902208172455e347099199f0382fb230bbdb593a
Merge: c043669 dc03499
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Jun 14 08:52:50 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jun 14 08:52:50 2013 -0400
Merge topic 'remove_extra_matches' into next
dc03499 Do not set CMAKE_MATCH_ variables when not neeeded
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc03499595086ec190d55c59c8589c112362dbb6
commit dc03499595086ec190d55c59c8589c112362dbb6
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Thu Jun 6 12:50:20 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Jun 14 08:46:14 2013 -0400
Do not set CMAKE_MATCH_ variables when not neeeded
Each call to AddDefinition has overhead for variable watches and such.
Avoid extra calls when not needed.
This decreases the configure time for ParaView by 10 seconds on my
machine. Without the change about 1,000,000 set-to-empty calls were
being made. After the change it drops to about 100,000.
diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx
index 1fbde01..68ba13f 100644
--- a/Source/cmStringCommand.cxx
+++ b/Source/cmStringCommand.cxx
@@ -534,8 +534,12 @@ void cmStringCommand::ClearMatches(cmMakefile* mf)
{
char name[128];
sprintf(name, CMAKE_MATCH_%d, i);
-mf-AddDefinition(name, );
-mf-MarkVariableAsUsed(name);
+const char* s = mf-GetDefinition(name);
+if(s *s != 0)
+ {
+ mf-AddDefinition(name, );
+ mf-MarkVariableAsUsed(name);
+ }
}
}
@@ -544,10 +548,14 @@ void cmStringCommand::StoreMatches(cmMakefile*
mf,cmsys::RegularExpression re)
{
for (unsigned int i=0; i10; i++)
{
-char name[128];
-sprintf(name, CMAKE_MATCH_%d, i);
-mf-AddDefinition(name, re.match(i).c_str());
-mf-MarkVariableAsUsed(name);
+std::string m = re.match(i);
+if(m.size() 0)
+ {
+ char name[128];
+ sprintf(name, CMAKE_MATCH_%d, i);
+ mf-AddDefinition(name, re.match(i).c_str());
+ mf-MarkVariableAsUsed(name);
+ }
}
}
---
Summary of changes:
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2623-g03e39be
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 03e39be5319c5104c839e13389341315210f31f1 (commit)
via bc460ea2fc9223092da2fd65daefaf8eecc16cfb (commit)
from 902208172455e347099199f0382fb230bbdb593a (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=03e39be5319c5104c839e13389341315210f31f1
commit 03e39be5319c5104c839e13389341315210f31f1
Merge: 9022081 bc460ea
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Jun 14 08:57:08 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jun 14 08:57:08 2013 -0400
Merge topic 'FixAsmSupport' into next
bc460ea asm support: adapt to changes in CMakeDetectCompiler in 2.8.10
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bc460ea2fc9223092da2fd65daefaf8eecc16cfb
commit bc460ea2fc9223092da2fd65daefaf8eecc16cfb
Author: Alex Neundorf neund...@kde.org
AuthorDate: Tue Jun 11 21:06:35 2013 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Jun 14 08:54:34 2013 -0400
asm support: adapt to changes in CMakeDetectCompiler in 2.8.10
This fixes #14210. In 2.8.10 CMakeDetermineCompiler.cmake was
modified (or added), and now the _INIT variable must not
be set to a list anymore, before it worked.
Alex
diff --git a/Modules/CMakeDetermineASM-ATTCompiler.cmake
b/Modules/CMakeDetermineASM-ATTCompiler.cmake
index cec09e9..03c5668 100644
--- a/Modules/CMakeDetermineASM-ATTCompiler.cmake
+++ b/Modules/CMakeDetermineASM-ATTCompiler.cmake
@@ -15,6 +15,6 @@
# determine the compiler to use for ASM using ATT syntax, e.g. GNU as
set(ASM_DIALECT -ATT)
-set(CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT ${_CMAKE_TOOLCHAIN_PREFIX}gas
${_CMAKE_TOOLCHAIN_PREFIX}as)
+set(CMAKE_ASM${ASM_DIALECT}_COMPILER_LIST ${_CMAKE_TOOLCHAIN_PREFIX}gas
${_CMAKE_TOOLCHAIN_PREFIX}as)
include(CMakeDetermineASMCompiler)
set(ASM_DIALECT)
diff --git a/Modules/CMakeDetermineASMCompiler.cmake
b/Modules/CMakeDetermineASMCompiler.cmake
index f62..99b04e3 100644
--- a/Modules/CMakeDetermineASMCompiler.cmake
+++ b/Modules/CMakeDetermineASMCompiler.cmake
@@ -39,8 +39,8 @@ if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER)
endif()
endif()
else() # some specific assembler dialect
-if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT)
- message(FATAL_ERROR CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT must be
preset !)
+if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT AND NOT
CMAKE_ASM${ASM_DIALECT}_COMPILER_LIST)
+ message(FATAL_ERROR CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT or
CMAKE_ASM${ASM_DIALECT}_COMPILER_LIST must be preset !)
endif()
endif()
diff --git a/Modules/CMakeDetermineASM_NASMCompiler.cmake
b/Modules/CMakeDetermineASM_NASMCompiler.cmake
index 50f71dd..5d783b1 100644
--- a/Modules/CMakeDetermineASM_NASMCompiler.cmake
+++ b/Modules/CMakeDetermineASM_NASMCompiler.cmake
@@ -14,7 +14,7 @@
# Find the nasm assembler. yasm (http://www.tortall.net/projects/yasm/) is
nasm compatible
-set(CMAKE_ASM_NASM_COMPILER_INIT nasm yasm)
+set(CMAKE_ASM_NASM_COMPILER_LIST nasm yasm)
if(NOT CMAKE_ASM_NASM_COMPILER)
find_program(CMAKE_ASM_NASM_COMPILER nasm
---
Summary of changes:
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.11.1-304-gbc3a7b6
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 bc3a7b61e261c9299b81d572d3fa3c78f87ec075 (commit) via ff01f8b60025cca88ebcba9b83ab9492b1521c2c (commit) from 3aaf04365c014a7a71ce5edbdb2d739349f120d1 (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=bc3a7b61e261c9299b81d572d3fa3c78f87ec075 commit bc3a7b61e261c9299b81d572d3fa3c78f87ec075 Merge: 3aaf043 ff01f8b Author: Brad King brad.k...@kitware.com AuthorDate: Fri Jun 14 08:59:54 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Jun 14 08:59:54 2013 -0400 Merge topic 'rpath-on-mac' ff01f8b OS X: Improvements for getting install name of dylib. --- Summary of changes: Source/cmSystemTools.cxx |5 - 1 files changed, 4 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.11.1-306-gf247474
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 f247474eb68cc0c96eb20164d0e52e14e3efb7d7 (commit) via dc03499595086ec190d55c59c8589c112362dbb6 (commit) from bc3a7b61e261c9299b81d572d3fa3c78f87ec075 (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=f247474eb68cc0c96eb20164d0e52e14e3efb7d7 commit f247474eb68cc0c96eb20164d0e52e14e3efb7d7 Merge: bc3a7b6 dc03499 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Jun 14 09:00:11 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Jun 14 09:00:11 2013 -0400 Merge topic 'remove_extra_matches' dc03499 Do not set CMAKE_MATCH_ variables when not neeeded --- Summary of changes: Source/cmStringCommand.cxx | 20 ++-- 1 files changed, 14 insertions(+), 6 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.11.1-310-gbbaae3e
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 bbaae3e42150db41c3386c80a631e1134ac085d5 (commit) via e3b7eac5933a7ca913ce4b0adaf8e5370b04c997 (commit) via ad304a2f7d2861b8127502f056ae4d8d07774c07 (commit) via 08319e071e4b876a8f9c35edf8d73f3c145dff35 (commit) from f247474eb68cc0c96eb20164d0e52e14e3efb7d7 (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=bbaae3e42150db41c3386c80a631e1134ac085d5 commit bbaae3e42150db41c3386c80a631e1134ac085d5 Merge: f247474 e3b7eac Author: Brad King brad.k...@kitware.com AuthorDate: Fri Jun 14 09:00:26 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Jun 14 09:00:26 2013 -0400 Merge topic 'minor-cleanup' e3b7eac Style: Don't put an else after a return. ad304a2 cmSystemTools: Fix typo in comment. 08319e0 Genex: Fix indentation in docs. --- Summary of changes: Source/cmDocumentGeneratorExpressions.h |4 ++-- Source/cmGeneratorExpressionEvaluator.cxx |3 --- Source/cmSystemTools.h|2 +- 3 files changed, 3 insertions(+), 6 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.11.1-312-ged2f59e
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 ed2f59e6149ab763c20653365fb881a9b9e315fd (commit) via 6a6cda5b4a0fe561cc5f5b7d6ec12775d17a4457 (commit) from bbaae3e42150db41c3386c80a631e1134ac085d5 (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=ed2f59e6149ab763c20653365fb881a9b9e315fd commit ed2f59e6149ab763c20653365fb881a9b9e315fd Merge: bbaae3e 6a6cda5 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Jun 14 09:00:39 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Jun 14 09:00:39 2013 -0400 Merge topic 'suppress-unused-cli-with-value-in-cache' 6a6cda5 Don't run the WarnUnusedCliUnused test on Windows. --- Summary of changes: Tests/CMakeLists.txt |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.11.1-318-gd556631
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 d556631079c8c54eb1a569b5b702412170ceee94 (commit) via 75994d953e261b388aa31e4d8ecd8af9fe53142b (commit) from 1f8733a0c25442a90397f0f7dd0fcb583b15ae8e (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=d556631079c8c54eb1a569b5b702412170ceee94 commit d556631079c8c54eb1a569b5b702412170ceee94 Merge: 1f8733a 75994d9 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Jun 14 09:01:22 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Jun 14 09:01:22 2013 -0400 Merge topic 'sha2-alignment' 75994d9 cmCryptoHash: Increase alignment of HashFile buffer --- Summary of changes: Source/cmCryptoHash.cxx |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.11.1-320-gdea8271
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 dea8271840b69bef078d7af324a72636ff195c94 (commit) via b3b57e7a31446bf7b0e47c7508d34f34cb322a6a (commit) from d556631079c8c54eb1a569b5b702412170ceee94 (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=dea8271840b69bef078d7af324a72636ff195c94 commit dea8271840b69bef078d7af324a72636ff195c94 Merge: d556631 b3b57e7 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Jun 14 09:01:39 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Jun 14 09:01:39 2013 -0400 Merge topic 'doc-enable_language-scope' b3b57e7 enable_language: Clarify documentation --- Summary of changes: Source/cmEnableLanguageCommand.h | 17 ++--- 1 files changed, 10 insertions(+), 7 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.11.1-316-g1f8733a
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 1f8733a0c25442a90397f0f7dd0fcb583b15ae8e (commit) via 22f7934a6e9c3dd350ec3ed6db91821783cd98a2 (commit) from 2acbd419e2db4901c45f9ffe4d85752004371d5e (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=1f8733a0c25442a90397f0f7dd0fcb583b15ae8e commit 1f8733a0c25442a90397f0f7dd0fcb583b15ae8e Merge: 2acbd41 22f7934 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Jun 14 09:01:17 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Jun 14 09:01:17 2013 -0400 Merge topic 'FixEclipseCorruptProjects' 22f7934 Eclipse: fix #14204 and #14205: no file links to directories --- Summary of changes: Source/cmExtraEclipseCDT4Generator.cxx | 15 +-- 1 files changed, 9 insertions(+), 6 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2633-g81e19c3
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 81e19c34912fba1829af3dc4dd60a5f369a0e02f (commit) via dea8271840b69bef078d7af324a72636ff195c94 (commit) via d556631079c8c54eb1a569b5b702412170ceee94 (commit) via 1f8733a0c25442a90397f0f7dd0fcb583b15ae8e (commit) via 2acbd419e2db4901c45f9ffe4d85752004371d5e (commit) via ed2f59e6149ab763c20653365fb881a9b9e315fd (commit) via bbaae3e42150db41c3386c80a631e1134ac085d5 (commit) via f247474eb68cc0c96eb20164d0e52e14e3efb7d7 (commit) via bc3a7b61e261c9299b81d572d3fa3c78f87ec075 (commit) via 3aaf04365c014a7a71ce5edbdb2d739349f120d1 (commit) from 03e39be5319c5104c839e13389341315210f31f1 (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=81e19c34912fba1829af3dc4dd60a5f369a0e02f commit 81e19c34912fba1829af3dc4dd60a5f369a0e02f Merge: 03e39be dea8271 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Jun 14 08:59:53 2013 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Fri Jun 14 08:59:53 2013 -0400 Merge branch 'master' into next --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2635-g94d0c90
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 94d0c909d3d979fa7b9baeef84010169944138c6 (commit) via b9f4383f698ae9207bb2701f1b82753e239e3248 (commit) from 81e19c34912fba1829af3dc4dd60a5f369a0e02f (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=94d0c909d3d979fa7b9baeef84010169944138c6 commit 94d0c909d3d979fa7b9baeef84010169944138c6 Merge: 81e19c3 b9f4383 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Jun 14 09:02:33 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Jun 14 09:02:33 2013 -0400 Merge topic 'split-command-sources' into next b9f4383 Split cmBootstrapCommands.cxx into two sources http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b9f4383f698ae9207bb2701f1b82753e239e3248 commit b9f4383f698ae9207bb2701f1b82753e239e3248 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Jun 14 08:35:52 2013 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Fri Jun 14 08:35:52 2013 -0400 Split cmBootstrapCommands.cxx into two sources The single translation unit has grown too large for some compilers. Split it into cmBootstrapCommands1.cxx and cmBootstrapCommands2.cxx. diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 1893167..a243702 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -113,7 +113,8 @@ endif() set(SRCS cmStandardIncludes.cxx cmArchiveWrite.cxx - cmBootstrapCommands.cxx + cmBootstrapCommands1.cxx + cmBootstrapCommands2.cxx cmCacheManager.cxx cmCacheManager.h cmCommands.cxx diff --git a/Source/cmBootstrapCommands.cxx b/Source/cmBootstrapCommands.cxx deleted file mode 100644 index 1b7a751..000 --- a/Source/cmBootstrapCommands.cxx +++ /dev/null @@ -1,173 +0,0 @@ -/* - CMake - Cross Platform Makefile Generator - Copyright 2000-2009 Kitware, Inc., Insight Software Consortium - - Distributed under the OSI-approved BSD License (the License); - see accompanying file Copyright.txt for details. - - This software is distributed WITHOUT ANY WARRANTY; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the License for more information. -*/ -// This file is used to compile all the commands -// that CMake knows about at compile time. -// This is sort of a boot strapping approach since you would -// like to have CMake to build CMake. -#include cmCommands.h -#include cmAddCustomCommandCommand.cxx -#include cmAddCustomTargetCommand.cxx -#include cmAddDefinitionsCommand.cxx -#include cmAddDependenciesCommand.cxx -#include cmAddExecutableCommand.cxx -#include cmAddLibraryCommand.cxx -#include cmAddSubDirectoryCommand.cxx -#include cmAddTestCommand.cxx -#include cmBreakCommand.cxx -#include cmBuildCommand.cxx -#include cmCMakeMinimumRequired.cxx -#include cmCMakePolicyCommand.cxx -#include cmCommandArgumentsHelper.cxx -#include cmConfigureFileCommand.cxx -#include cmCoreTryCompile.cxx -#include cmCreateTestSourceList.cxx -#include cmDefinePropertyCommand.cxx -#include cmElseCommand.cxx -#include cmEnableLanguageCommand.cxx -#include cmEnableTestingCommand.cxx -#include cmEndForEachCommand.cxx -#include cmEndFunctionCommand.cxx -#include cmEndIfCommand.cxx -#include cmEndMacroCommand.cxx -#include cmEndWhileCommand.cxx -#include cmExecProgramCommand.cxx -#include cmExecuteProcessCommand.cxx -#include cmExternalMakefileProjectGenerator.cxx -#include cmFindBase.cxx -#include cmFindCommon.cxx -#include cmFileCommand.cxx -#include cmFindFileCommand.cxx -#include cmFindLibraryCommand.cxx -#include cmFindPackageCommand.cxx -#include cmFindPathCommand.cxx -#include cmFindProgramCommand.cxx -#include cmForEachCommand.cxx -#include cmFunctionCommand.cxx -#include cmGeneratorExpressionEvaluationFile.cxx -#include cmGetCMakePropertyCommand.cxx -#include cmGetDirectoryPropertyCommand.cxx -#include cmGetFilenameComponentCommand.cxx -#include cmGetPropertyCommand.cxx -#include cmGetSourceFilePropertyCommand.cxx -#include cmGetTargetPropertyCommand.cxx -#include cmHexFileConverter.cxx -#include cmIfCommand.cxx -#include cmIncludeCommand.cxx -#include cmIncludeDirectoryCommand.cxx -#include cmIncludeRegularExpressionCommand.cxx -#include cmInstallFilesCommand.cxx -#include cmInstallCommandArguments.cxx -#include cmInstallCommand.cxx -#include cmInstallTargetsCommand.cxx -#include cmLinkDirectoriesCommand.cxx -#include cmListCommand.cxx -#include cmMacroCommand.cxx -#include
[Cmake-commits] CMake branch, master, updated. v2.8.11.1-321-g19df459
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 19df4595e27e85187742e100aa202385ad0c330b (commit) from dea8271840b69bef078d7af324a72636ff195c94 (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=19df4595e27e85187742e100aa202385ad0c330b commit 19df4595e27e85187742e100aa202385ad0c330b Author: Kitware Robot kwro...@kitware.com AuthorDate: Sat Jun 15 00:01:03 2013 -0400 Commit: Kitware Robot kwro...@kitware.com CommitDate: Sat Jun 15 00:01:03 2013 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 91b2202..d8e6d66 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -2,5 +2,5 @@ set(CMake_VERSION_MAJOR 2) set(CMake_VERSION_MINOR 8) set(CMake_VERSION_PATCH 11) -set(CMake_VERSION_TWEAK 20130614) +set(CMake_VERSION_TWEAK 20130615) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
