[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2679-g4ab0bfa
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 4ab0bfa94699e27114412708501833a6e40eed21 (commit)
via d3050fe63a829e54f698f985558036c3e57568af (commit)
from 03604c1d9729ca23191e38c22c9c4ddea43da7f8 (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=4ab0bfa94699e27114412708501833a6e40eed21
commit 4ab0bfa94699e27114412708501833a6e40eed21
Merge: 03604c1 d3050fe
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Jun 21 07:53:55 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jun 21 07:53:55 2013 -0400
Merge topic 'add-whitespace' into next
d3050fe Add whitespace after colons in error messages.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d3050fe63a829e54f698f985558036c3e57568af
commit d3050fe63a829e54f698f985558036c3e57568af
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Jun 21 13:51:58 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Fri Jun 21 13:51:58 2013 +0200
Add whitespace after colons in error messages.
diff --git a/Source/cmComputeLinkInformation.cxx
b/Source/cmComputeLinkInformation.cxx
index 02495c4..ab9eb14 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -499,7 +499,7 @@ bool cmComputeLinkInformation::Compute()
if(!this-LinkLanguage)
{
cmSystemTools::
- Error(CMake can not determine linker language for target:,
+ Error(CMake can not determine linker language for target: ,
this-Target-GetName());
return false;
}
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 3e3e5e4..ad74767 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -415,7 +415,7 @@
cmGlobalGenerator::EnableLanguage(std::vectorstd::stringconst languages,
{
if(!mf-ReadListFile(0,fpath.c_str()))
{
- cmSystemTools::Error(Could not find cmake module file:,
+ cmSystemTools::Error(Could not find cmake module file: ,
fpath.c_str());
}
// if this file was found then the language was already determined
@@ -445,7 +445,7 @@
cmGlobalGenerator::EnableLanguage(std::vectorstd::stringconst languages,
mf-GetModulesFile(determineCompiler.c_str());
if(!mf-ReadListFile(0,determineFile.c_str()))
{
-cmSystemTools::Error(Could not find cmake module file:,
+cmSystemTools::Error(Could not find cmake module file: ,
determineFile.c_str());
}
needTestLanguage[lang] = true;
@@ -479,7 +479,7 @@
cmGlobalGenerator::EnableLanguage(std::vectorstd::stringconst languages,
fpath += Compiler.cmake;
if(!mf-ReadListFile(0,fpath.c_str()))
{
-cmSystemTools::Error(Could not find cmake module file:,
+cmSystemTools::Error(Could not find cmake module file: ,
fpath.c_str());
}
this-SetLanguageEnabledFlag(lang, mf);
@@ -498,7 +498,7 @@
cmGlobalGenerator::EnableLanguage(std::vectorstd::stringconst languages,
fpath = mf-GetModulesFile(CMakeSystemSpecificInformation.cmake);
if(!mf-ReadListFile(0,fpath.c_str()))
{
- cmSystemTools::Error(Could not find cmake module file:,
+ cmSystemTools::Error(Could not find cmake module file: ,
fpath.c_str());
}
}
@@ -524,12 +524,12 @@
cmGlobalGenerator::EnableLanguage(std::vectorstd::stringconst languages,
std::string informationFile = mf-GetModulesFile(fpath.c_str());
if (informationFile.empty())
{
-cmSystemTools::Error(Could not find cmake module file:,
+cmSystemTools::Error(Could not find cmake module file: ,
fpath.c_str());
}
else if(!mf-ReadListFile(0, informationFile.c_str()))
{
-cmSystemTools::Error(Could not process cmake module file:,
+cmSystemTools::Error(Could not process cmake module file: ,
informationFile.c_str());
}
}
@@ -568,7 +568,7 @@
cmGlobalGenerator::EnableLanguage(std::vectorstd::stringconst languages,
std::string ifpath = mf-GetModulesFile(testLang.c_str());
if(!mf-ReadListFile(0,ifpath.c_str()))
{
- cmSystemTools::Error(Could not find cmake module file:,
+ cmSystemTools::Error(Could not find cmake module file: ,
ifpath.c_str());
}
std::string compilerWorks = CMAKE_;
diff --git
[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2682-gd684188
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 d6841889d49e0f305409dfffa7cc938949e05556 (commit) via 480e924daedee520d18c8a9c0b9823fef205b57a (commit) via 9f160c5b0a7e0f821ca4737638edbebf0ed398be (commit) from 4ab0bfa94699e27114412708501833a6e40eed21 (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=d6841889d49e0f305409dfffa7cc938949e05556 commit d6841889d49e0f305409dfffa7cc938949e05556 Merge: 4ab0bfa 480e924 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Jun 21 08:30:52 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Jun 21 08:30:52 2013 -0400 Merge topic 'openbsd-elf-parsing' into next 480e924 OpenBSD: Enable ELF parsing and editing (#14241) 9f160c5 CMake Nightly Date Stamp http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=480e924daedee520d18c8a9c0b9823fef205b57a commit 480e924daedee520d18c8a9c0b9823fef205b57a Author: David Coppa dco...@openbsd.org AuthorDate: Fri Jun 21 11:13:35 2013 +0200 Commit: Brad King brad.k...@kitware.com CommitDate: Fri Jun 21 08:27:40 2013 -0400 OpenBSD: Enable ELF parsing and editing (#14241) OpenBSD provides ELF ABI declarations in #include stdint.h #include elf_abi.h Teach the platform check and cmELF implementation to use these. diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 1893167..67a6333 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -11,7 +11,11 @@ #= include(CheckIncludeFile) # Check if we can build support for ELF parsing. -CHECK_INCLUDE_FILE(elf.h HAVE_ELF_H) +if(CMAKE_CXX_PLATFORM_ID MATCHES OpenBSD) + CHECK_INCLUDE_FILES(stdint.h;elf_abi.h HAVE_ELF_H) +else() + CHECK_INCLUDE_FILE(elf.h HAVE_ELF_H) +endif() if(HAVE_ELF_H) set(CMAKE_USE_ELF_PARSER 1) else() diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx index 1158fc0..30de9a8 100644 --- a/Source/cmELF.cxx +++ b/Source/cmELF.cxx @@ -19,7 +19,12 @@ #include cmsys/CPU.h // Include the ELF format information system header. -#include elf.h +#if defined(__OpenBSD__) +# include stdint.h +# include elf_abi.h +#else +# include elf.h +#endif #if defined(__sun) # include sys/link.h // For dynamic section information #endif --- Summary of changes: Source/CMakeLists.txt |6 +- Source/CMakeVersion.cmake |2 +- Source/cmELF.cxx |7 ++- 3 files changed, 12 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, next, updated. v2.8.11.1-2685-g0c73924
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 0c7392465c901711904a5c08361b384f44a496ee (commit)
via 2aa62e0b4bd311e7538082fea70785871572e420 (commit)
via 1746a35df115e66a266481020591de231bfdfdf2 (commit)
from d6841889d49e0f305409dfffa7cc938949e05556 (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=0c7392465c901711904a5c08361b384f44a496ee
commit 0c7392465c901711904a5c08361b384f44a496ee
Merge: d684188 2aa62e0
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Jun 21 08:55:47 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jun 21 08:55:47 2013 -0400
Merge topic 'CMakeDetermineVSServicePack-vs11' into next
2aa62e0 CMakeDetermineVSServicePack: Add VS 11 update 1 and 2 (#14239)
1746a35 CMakeDetermineVSServicePack: Improve documentation
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2aa62e0b4bd311e7538082fea70785871572e420
commit 2aa62e0b4bd311e7538082fea70785871572e420
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Jun 21 08:51:13 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Jun 21 08:51:13 2013 -0400
CMakeDetermineVSServicePack: Add VS 11 update 1 and 2 (#14239)
diff --git a/Modules/CMakeDetermineVSServicePack.cmake
b/Modules/CMakeDetermineVSServicePack.cmake
index 26c8ac0..17b4bbf 100644
--- a/Modules/CMakeDetermineVSServicePack.cmake
+++ b/Modules/CMakeDetermineVSServicePack.cmake
@@ -16,7 +16,7 @@
# vc80, vc80sp1
# vc90, vc90sp1
# vc100, vc100sp1
-# vc110
+# vc110, vc110sp1, vc110sp2
#=
# Copyright 2009-2013 Kitware, Inc.
@@ -50,6 +50,10 @@ function(_DetermineVSServicePackFromCompiler _OUT_VAR
_cl_version)
set(_version vc100sp1)
elseif(${_cl_version} VERSION_EQUAL 17.00.50727.1)
set(_version vc110)
+ elseif(${_cl_version} VERSION_EQUAL 17.00.51106.1)
+ set(_version vc110sp1)
+ elseif(${_cl_version} VERSION_EQUAL 17.00.60315.1)
+ set(_version vc110sp2)
else()
set(_version )
endif()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1746a35df115e66a266481020591de231bfdfdf2
commit 1746a35df115e66a266481020591de231bfdfdf2
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Jun 21 08:48:58 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Jun 21 08:48:58 2013 -0400
CMakeDetermineVSServicePack: Improve documentation
Refer users to the newer CMAKE_LANG_COMPILER_VERSION variables.
Use a more concise summary. Format the documentation to look
better in the cmake --help-module output.
diff --git a/Modules/CMakeDetermineVSServicePack.cmake
b/Modules/CMakeDetermineVSServicePack.cmake
index 98e5bb8..26c8ac0 100644
--- a/Modules/CMakeDetermineVSServicePack.cmake
+++ b/Modules/CMakeDetermineVSServicePack.cmake
@@ -1,32 +1,25 @@
-# - Includes a public function for assisting users in trying to determine the
-# Visual Studio service pack in use.
-#
-# Sets the passed in variable to one of the following values or an empty
-# string if unknown.
-#vc80
-#vc80sp1
-#vc90
-#vc90sp1
-#vc100
-#vc100sp1
-#vc110
+# - Determine the Visual Studio service pack of the 'cl' in use.
+# The functionality of this module has been superseded by the platform
+# variable CMAKE_LANG_COMPILER_VERSION that contains the compiler version
+# number.
#
# Usage:
-# ===
-#
-#if(MSVC)
-# include(CMakeDetermineVSServicePack)
-# DetermineVSServicePack( my_service_pack )
-#
-# if( my_service_pack )
-# message(STATUS Detected: ${my_service_pack})
-# endif()
+# if(MSVC)
+#include(CMakeDetermineVSServicePack)
+#DetermineVSServicePack( my_service_pack )
+#if( my_service_pack )
+# message(STATUS Detected: ${my_service_pack})
#endif()
-#
-# ===
+# endif()
+# Function DetermineVSServicePack sets the given variable to one of the
+# following values or an empty string if unknown:
+# vc80, vc80sp1
+# vc90, vc90sp1
+# vc100, vc100sp1
+# vc110
#=
-# Copyright 2009-2011 Kitware, Inc.
+# Copyright 2009-2013 Kitware, Inc.
# Copyright 2009-2010 Philip Lowman phi...@yhbt.com
# Copyright 2010-2011 Aaron C. meadows cm...@shadowguarddev.com
#
---
Summary of changes:
Modules/CMakeDetermineVSServicePack.cmake | 45 +---
1 files changed, 21
[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2687-ga7e8877
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 a7e887799922893b5185ed09364464bcc1628e2f (commit) via 9b0116ea206e8eb36eba3113fa9f596b80e48a86 (commit) from 0c7392465c901711904a5c08361b384f44a496ee (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=a7e887799922893b5185ed09364464bcc1628e2f commit a7e887799922893b5185ed09364464bcc1628e2f Merge: 0c73924 9b0116e Author: Stephen Kelly steve...@gmail.com AuthorDate: Fri Jun 21 10:15:49 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Jun 21 10:15:49 2013 -0400 Merge topic 'add-whitespace' into next 9b0116e Add whitespace in tests. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b0116ea206e8eb36eba3113fa9f596b80e48a86 commit 9b0116ea206e8eb36eba3113fa9f596b80e48a86 Author: Stephen Kelly steve...@gmail.com AuthorDate: Fri Jun 21 16:15:03 2013 +0200 Commit: Stephen Kelly steve...@gmail.com CommitDate: Fri Jun 21 16:15:03 2013 +0200 Add whitespace in tests. diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 621c5f4..b660442 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -245,7 +245,7 @@ if(BUILD_TESTING) ADD_TEST_MACRO(CompileOptions CompileOptions) ADD_TEST_MACRO(CompatibleInterface CompatibleInterface) set_tests_properties(EmptyLibrary PROPERTIES -PASS_REGULAR_EXPRESSION CMake Error: CMake can not determine linker language for target:test) +PASS_REGULAR_EXPRESSION CMake Error: CMake can not determine linker language for target: test) ADD_TEST_MACRO(CrossCompile CrossCompile) set_tests_properties(CrossCompile PROPERTIES PASS_REGULAR_EXPRESSION TRY_RUN.. invoked in cross-compiling mode) diff --git a/Tests/RunCMake/Languages/NoLangSHARED-stderr.txt b/Tests/RunCMake/Languages/NoLangSHARED-stderr.txt index 3f93cf8..983129a 100644 --- a/Tests/RunCMake/Languages/NoLangSHARED-stderr.txt +++ b/Tests/RunCMake/Languages/NoLangSHARED-stderr.txt @@ -1 +1 @@ -CMake Error: CMake can not determine linker language for target:NoLang +CMake Error: CMake can not determine linker language for target: NoLang --- Summary of changes: Tests/CMakeLists.txt |2 +- Tests/RunCMake/Languages/NoLangSHARED-stderr.txt |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2693-g489e552
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 489e552aa3713da6d990b12bfbffdb1b4846667c (commit)
via 2331b57bec82e1433b408f08de03202a60cb4578 (commit)
from aa862cc5b238cf15aa62b7acfe5d0f6ad6631eae (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=489e552aa3713da6d990b12bfbffdb1b4846667c
commit 489e552aa3713da6d990b12bfbffdb1b4846667c
Merge: aa862cc 2331b57
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Jun 21 10:22:19 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jun 21 10:22:19 2013 -0400
Merge topic 'add-whitespace' into next
2331b57 Add whitespace after colons in error messages.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2331b57bec82e1433b408f08de03202a60cb4578
commit 2331b57bec82e1433b408f08de03202a60cb4578
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Jun 21 13:51:58 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Fri Jun 21 16:21:44 2013 +0200
Add whitespace after colons in error messages.
diff --git a/Source/cmComputeLinkInformation.cxx
b/Source/cmComputeLinkInformation.cxx
index 02495c4..ab9eb14 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -499,7 +499,7 @@ bool cmComputeLinkInformation::Compute()
if(!this-LinkLanguage)
{
cmSystemTools::
- Error(CMake can not determine linker language for target:,
+ Error(CMake can not determine linker language for target: ,
this-Target-GetName());
return false;
}
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 3e3e5e4..ad74767 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -415,7 +415,7 @@
cmGlobalGenerator::EnableLanguage(std::vectorstd::stringconst languages,
{
if(!mf-ReadListFile(0,fpath.c_str()))
{
- cmSystemTools::Error(Could not find cmake module file:,
+ cmSystemTools::Error(Could not find cmake module file: ,
fpath.c_str());
}
// if this file was found then the language was already determined
@@ -445,7 +445,7 @@
cmGlobalGenerator::EnableLanguage(std::vectorstd::stringconst languages,
mf-GetModulesFile(determineCompiler.c_str());
if(!mf-ReadListFile(0,determineFile.c_str()))
{
-cmSystemTools::Error(Could not find cmake module file:,
+cmSystemTools::Error(Could not find cmake module file: ,
determineFile.c_str());
}
needTestLanguage[lang] = true;
@@ -479,7 +479,7 @@
cmGlobalGenerator::EnableLanguage(std::vectorstd::stringconst languages,
fpath += Compiler.cmake;
if(!mf-ReadListFile(0,fpath.c_str()))
{
-cmSystemTools::Error(Could not find cmake module file:,
+cmSystemTools::Error(Could not find cmake module file: ,
fpath.c_str());
}
this-SetLanguageEnabledFlag(lang, mf);
@@ -498,7 +498,7 @@
cmGlobalGenerator::EnableLanguage(std::vectorstd::stringconst languages,
fpath = mf-GetModulesFile(CMakeSystemSpecificInformation.cmake);
if(!mf-ReadListFile(0,fpath.c_str()))
{
- cmSystemTools::Error(Could not find cmake module file:,
+ cmSystemTools::Error(Could not find cmake module file: ,
fpath.c_str());
}
}
@@ -524,12 +524,12 @@
cmGlobalGenerator::EnableLanguage(std::vectorstd::stringconst languages,
std::string informationFile = mf-GetModulesFile(fpath.c_str());
if (informationFile.empty())
{
-cmSystemTools::Error(Could not find cmake module file:,
+cmSystemTools::Error(Could not find cmake module file: ,
fpath.c_str());
}
else if(!mf-ReadListFile(0, informationFile.c_str()))
{
-cmSystemTools::Error(Could not process cmake module file:,
+cmSystemTools::Error(Could not process cmake module file: ,
informationFile.c_str());
}
}
@@ -568,7 +568,7 @@
cmGlobalGenerator::EnableLanguage(std::vectorstd::stringconst languages,
std::string ifpath = mf-GetModulesFile(testLang.c_str());
if(!mf-ReadListFile(0,ifpath.c_str()))
{
- cmSystemTools::Error(Could not find cmake module file:,
+ cmSystemTools::Error(Could not find cmake module file: ,
ifpath.c_str());
}
std::string compilerWorks = CMAKE_;
diff --git
[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2689-ga4cfe11
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 a4cfe11940a3a7ebb7c47d70060c59883e9624ad (commit)
via c693a877840ee3ae679ab3def7e03d61f9f385f5 (commit)
from a7e887799922893b5185ed09364464bcc1628e2f (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=a4cfe11940a3a7ebb7c47d70060c59883e9624ad
commit a4cfe11940a3a7ebb7c47d70060c59883e9624ad
Merge: a7e8877 c693a87
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Jun 21 10:17:13 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Jun 21 10:17:13 2013 -0400
Merge topic 'add-whitespace' into next
c693a87 Add whitespace after colons in error messages.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c693a877840ee3ae679ab3def7e03d61f9f385f5
commit c693a877840ee3ae679ab3def7e03d61f9f385f5
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Fri Jun 21 13:51:58 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Fri Jun 21 16:16:02 2013 +0200
Add whitespace after colons in error messages.
diff --git a/Source/cmComputeLinkInformation.cxx
b/Source/cmComputeLinkInformation.cxx
index 02495c4..ab9eb14 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -499,7 +499,7 @@ bool cmComputeLinkInformation::Compute()
if(!this-LinkLanguage)
{
cmSystemTools::
- Error(CMake can not determine linker language for target:,
+ Error(CMake can not determine linker language for target: ,
this-Target-GetName());
return false;
}
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 3e3e5e4..ad74767 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -415,7 +415,7 @@
cmGlobalGenerator::EnableLanguage(std::vectorstd::stringconst languages,
{
if(!mf-ReadListFile(0,fpath.c_str()))
{
- cmSystemTools::Error(Could not find cmake module file:,
+ cmSystemTools::Error(Could not find cmake module file: ,
fpath.c_str());
}
// if this file was found then the language was already determined
@@ -445,7 +445,7 @@
cmGlobalGenerator::EnableLanguage(std::vectorstd::stringconst languages,
mf-GetModulesFile(determineCompiler.c_str());
if(!mf-ReadListFile(0,determineFile.c_str()))
{
-cmSystemTools::Error(Could not find cmake module file:,
+cmSystemTools::Error(Could not find cmake module file: ,
determineFile.c_str());
}
needTestLanguage[lang] = true;
@@ -479,7 +479,7 @@
cmGlobalGenerator::EnableLanguage(std::vectorstd::stringconst languages,
fpath += Compiler.cmake;
if(!mf-ReadListFile(0,fpath.c_str()))
{
-cmSystemTools::Error(Could not find cmake module file:,
+cmSystemTools::Error(Could not find cmake module file: ,
fpath.c_str());
}
this-SetLanguageEnabledFlag(lang, mf);
@@ -498,7 +498,7 @@
cmGlobalGenerator::EnableLanguage(std::vectorstd::stringconst languages,
fpath = mf-GetModulesFile(CMakeSystemSpecificInformation.cmake);
if(!mf-ReadListFile(0,fpath.c_str()))
{
- cmSystemTools::Error(Could not find cmake module file:,
+ cmSystemTools::Error(Could not find cmake module file: ,
fpath.c_str());
}
}
@@ -524,12 +524,12 @@
cmGlobalGenerator::EnableLanguage(std::vectorstd::stringconst languages,
std::string informationFile = mf-GetModulesFile(fpath.c_str());
if (informationFile.empty())
{
-cmSystemTools::Error(Could not find cmake module file:,
+cmSystemTools::Error(Could not find cmake module file: ,
fpath.c_str());
}
else if(!mf-ReadListFile(0, informationFile.c_str()))
{
-cmSystemTools::Error(Could not process cmake module file:,
+cmSystemTools::Error(Could not process cmake module file: ,
informationFile.c_str());
}
}
@@ -568,7 +568,7 @@
cmGlobalGenerator::EnableLanguage(std::vectorstd::stringconst languages,
std::string ifpath = mf-GetModulesFile(testLang.c_str());
if(!mf-ReadListFile(0,ifpath.c_str()))
{
- cmSystemTools::Error(Could not find cmake module file:,
+ cmSystemTools::Error(Could not find cmake module file: ,
ifpath.c_str());
}
std::string compilerWorks = CMAKE_;
diff --git
[Cmake-commits] CMake branch, master, updated. v2.8.11.1-328-g8573748
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 8573748041db8b32056f7af7582b7369fc0b969c (commit) from 9f160c5b0a7e0f821ca4737638edbebf0ed398be (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=8573748041db8b32056f7af7582b7369fc0b969c commit 8573748041db8b32056f7af7582b7369fc0b969c Author: Kitware Robot kwro...@kitware.com AuthorDate: Sat Jun 22 00:01:04 2013 -0400 Commit: Kitware Robot kwro...@kitware.com CommitDate: Sat Jun 22 00:01:04 2013 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 0b20214..d0d1922 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 20130621) +set(CMake_VERSION_TWEAK 20130622) #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
