[Cmake-commits] CMake branch, next, updated. v3.6.2-2575-gbe44093
Brad King
brad.king at kitware.com
Wed Sep 28 09:39:38 EDT 2016
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 be4409380f0aea73c6816554fd8c7228a65a527f (commit)
via 99e236c5eaf4b97fc2ca54ad3c4c848948bcb9e7 (commit)
from 58733dc407fb648a26a11cc4a0f4ecf45d6b7bbb (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=be4409380f0aea73c6816554fd8c7228a65a527f
commit be4409380f0aea73c6816554fd8c7228a65a527f
Merge: 58733dc 99e236c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 28 09:39:35 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 28 09:39:35 2016 -0400
Merge topic 'fix-explicit-RC' into next
99e236c5 Revert topic 'fix-explicit-RC'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=99e236c5eaf4b97fc2ca54ad3c4c848948bcb9e7
commit 99e236c5eaf4b97fc2ca54ad3c4c848948bcb9e7
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 28 09:39:02 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 28 09:39:02 2016 -0400
Revert topic 'fix-explicit-RC'
This breaks on Cygwin. Another approach is needed.
diff --git a/Modules/Platform/CYGWIN-GNU.cmake b/Modules/Platform/CYGWIN-GNU.cmake
index 0d11209..5090c08 100644
--- a/Modules/Platform/CYGWIN-GNU.cmake
+++ b/Modules/Platform/CYGWIN-GNU.cmake
@@ -57,5 +57,5 @@ macro(__cygwin_compiler_gnu lang)
set(CMAKE_RC_COMPILER_INIT windres)
endif()
- enable_language(RC __CMAKE_INTERNAL)
+ enable_language(RC)
endmacro()
diff --git a/Modules/Platform/Windows-GNU.cmake b/Modules/Platform/Windows-GNU.cmake
index 7632d52..d8a423e 100644
--- a/Modules/Platform/Windows-GNU.cmake
+++ b/Modules/Platform/Windows-GNU.cmake
@@ -142,7 +142,7 @@ macro(__windows_compiler_gnu lang)
set(CMAKE_RC_COMPILER_INIT windres)
endif()
- enable_language(RC __CMAKE_INTERNAL)
+ enable_language(RC)
endmacro()
macro(__windows_compiler_gnu_abi lang)
diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index 319eeab..723c69e 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -317,6 +317,6 @@ macro(__windows_compiler_msvc lang)
string(APPEND CMAKE_RC_FLAGS_INIT " ${_PLATFORM_DEFINES} ${_PLATFORM_DEFINES_${lang}}")
endif()
- enable_language(RC __CMAKE_INTERNAL)
+ enable_language(RC)
set(CMAKE_NINJA_CMCLDEPS_RC 1)
endmacro()
diff --git a/Source/cmEnableLanguageCommand.cxx b/Source/cmEnableLanguageCommand.cxx
index 1c32f81..9b7dd03 100644
--- a/Source/cmEnableLanguageCommand.cxx
+++ b/Source/cmEnableLanguageCommand.cxx
@@ -16,7 +16,6 @@ bool cmEnableLanguageCommand::InitialPass(std::vector<std::string> const& args,
cmExecutionStatus&)
{
bool optional = false;
- bool internal = false;
std::vector<std::string> languages;
if (args.empty()) {
this->SetError("called with incorrect number of arguments");
@@ -26,13 +25,11 @@ bool cmEnableLanguageCommand::InitialPass(std::vector<std::string> const& args,
it != args.end(); ++it) {
if ((*it) == "OPTIONAL") {
optional = true;
- } else if ((*it) == "__CMAKE_INTERNAL") {
- internal = true;
} else {
languages.push_back(*it);
}
}
- this->Makefile->EnableLanguage(languages, optional, internal);
+ this->Makefile->EnableLanguage(languages, optional);
return true;
}
diff --git a/Source/cmGlobalBorlandMakefileGenerator.cxx b/Source/cmGlobalBorlandMakefileGenerator.cxx
index 9f738ca..0f4de73 100644
--- a/Source/cmGlobalBorlandMakefileGenerator.cxx
+++ b/Source/cmGlobalBorlandMakefileGenerator.cxx
@@ -31,15 +31,13 @@ cmGlobalBorlandMakefileGenerator::cmGlobalBorlandMakefileGenerator(cmake* cm)
}
void cmGlobalBorlandMakefileGenerator::EnableLanguage(
- std::vector<std::string> const& l, cmMakefile* mf, bool optional,
- bool internal)
+ std::vector<std::string> const& l, cmMakefile* mf, bool optional)
{
std::string outdir = this->CMakeInstance->GetHomeOutputDirectory();
mf->AddDefinition("BORLAND", "1");
mf->AddDefinition("CMAKE_GENERATOR_CC", "bcc32");
mf->AddDefinition("CMAKE_GENERATOR_CXX", "bcc32");
- this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional,
- internal);
+ this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional);
}
///! Create a local generator appropriate to this Global Generator
diff --git a/Source/cmGlobalBorlandMakefileGenerator.h b/Source/cmGlobalBorlandMakefileGenerator.h
index 5a59e56..4e10f10 100644
--- a/Source/cmGlobalBorlandMakefileGenerator.h
+++ b/Source/cmGlobalBorlandMakefileGenerator.h
@@ -46,8 +46,8 @@ public:
* Try to determine system information such as shared library
* extension, pthreads, byte order etc.
*/
- void EnableLanguage(std::vector<std::string> const& languages, cmMakefile*,
- bool optional, bool internal) CM_OVERRIDE;
+ virtual void EnableLanguage(std::vector<std::string> const& languages,
+ cmMakefile*, bool optional);
virtual bool AllowNotParallel() const { return false; }
virtual bool AllowDeleteOnError() const { return false; }
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index aee707b..4c62be7 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -371,8 +371,7 @@ bool cmGlobalGenerator::CheckLanguages(
//
void cmGlobalGenerator::EnableLanguage(
- std::vector<std::string> const& languages, cmMakefile* mf, bool optional,
- bool internal)
+ std::vector<std::string> const& languages, cmMakefile* mf, bool optional)
{
if (languages.empty()) {
cmSystemTools::Error("EnableLanguage must have a lang specified!");
@@ -380,12 +379,10 @@ void cmGlobalGenerator::EnableLanguage(
return;
}
- std::set<std::string> cur_languages;
- for (std::vector<std::string>::const_iterator li = languages.begin();
- li != languages.end(); ++li) {
- if (this->LanguagesInProgress.insert(*li).second) {
- cur_languages.insert(*li);
- } else if (!internal) {
+ std::set<std::string> cur_languages(languages.begin(), languages.end());
+ for (std::set<std::string>::iterator li = cur_languages.begin();
+ li != cur_languages.end(); ++li) {
+ if (!this->LanguagesInProgress.insert(*li).second) {
std::ostringstream e;
e << "Language '" << *li << "' is currently being enabled. "
"Recursive call not allowed.";
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index b32fd4e..8f1d70c 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -120,7 +120,7 @@ public:
* extension, pthreads, byte order etc.
*/
virtual void EnableLanguage(std::vector<std::string> const& languages,
- cmMakefile*, bool optional, bool internal);
+ cmMakefile*, bool optional);
/**
* Resolve the CMAKE_<lang>_COMPILER setting for the given language.
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index cea7eeb..d75ebf8 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -49,8 +49,7 @@ void cmGlobalGhsMultiGenerator::GetDocumentation(cmDocumentationEntry& entry)
}
void cmGlobalGhsMultiGenerator::EnableLanguage(
- std::vector<std::string> const& l, cmMakefile* mf, bool optional,
- bool internal)
+ std::vector<std::string> const& l, cmMakefile* mf, bool optional)
{
mf->AddDefinition("CMAKE_SYSTEM_NAME", "GHS-MULTI");
mf->AddDefinition("CMAKE_SYSTEM_PROCESSOR", "ARM");
@@ -80,7 +79,7 @@ void cmGlobalGhsMultiGenerator::EnableLanguage(
}
mf->AddDefinition("GHSMULTI", "1"); // identifier for user CMake files
- this->cmGlobalGenerator::EnableLanguage(l, mf, optional, internal);
+ this->cmGlobalGenerator::EnableLanguage(l, mf, optional);
}
void cmGlobalGhsMultiGenerator::FindMakeProgram(cmMakefile* mf)
diff --git a/Source/cmGlobalGhsMultiGenerator.h b/Source/cmGlobalGhsMultiGenerator.h
index 7008e77..b2aac45 100644
--- a/Source/cmGlobalGhsMultiGenerator.h
+++ b/Source/cmGlobalGhsMultiGenerator.h
@@ -61,8 +61,8 @@ public:
* Try to determine system information such as shared library
* extension, pthreads, byte order etc.
*/
- void EnableLanguage(std::vector<std::string> const& languages, cmMakefile*,
- bool optional, bool internal) CM_OVERRIDE;
+ virtual void EnableLanguage(std::vector<std::string> const& languages,
+ cmMakefile*, bool optional);
/*
* Determine what program to use for building the project.
*/
diff --git a/Source/cmGlobalJOMMakefileGenerator.cxx b/Source/cmGlobalJOMMakefileGenerator.cxx
index 87eb217..0bdd624 100644
--- a/Source/cmGlobalJOMMakefileGenerator.cxx
+++ b/Source/cmGlobalJOMMakefileGenerator.cxx
@@ -30,14 +30,12 @@ cmGlobalJOMMakefileGenerator::cmGlobalJOMMakefileGenerator(cmake* cm)
}
void cmGlobalJOMMakefileGenerator::EnableLanguage(
- std::vector<std::string> const& l, cmMakefile* mf, bool optional,
- bool internal)
+ std::vector<std::string> const& l, cmMakefile* mf, bool optional)
{
// pick a default
mf->AddDefinition("CMAKE_GENERATOR_CC", "cl");
mf->AddDefinition("CMAKE_GENERATOR_CXX", "cl");
- this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional,
- internal);
+ this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional);
}
void cmGlobalJOMMakefileGenerator::GetDocumentation(
diff --git a/Source/cmGlobalJOMMakefileGenerator.h b/Source/cmGlobalJOMMakefileGenerator.h
index a66dcc6..bb2273a 100644
--- a/Source/cmGlobalJOMMakefileGenerator.h
+++ b/Source/cmGlobalJOMMakefileGenerator.h
@@ -43,8 +43,8 @@ public:
* Try to determine system information such as shared library
* extension, pthreads, byte order etc.
*/
- void EnableLanguage(std::vector<std::string> const& languages, cmMakefile*,
- bool optional, bool internal) CM_OVERRIDE;
+ virtual void EnableLanguage(std::vector<std::string> const& languages,
+ cmMakefile*, bool optional);
private:
void PrintCompilerAdvice(std::ostream& os, std::string const& lang,
diff --git a/Source/cmGlobalMSYSMakefileGenerator.cxx b/Source/cmGlobalMSYSMakefileGenerator.cxx
index c544aad..6bf178a 100644
--- a/Source/cmGlobalMSYSMakefileGenerator.cxx
+++ b/Source/cmGlobalMSYSMakefileGenerator.cxx
@@ -47,8 +47,7 @@ std::string cmGlobalMSYSMakefileGenerator::FindMinGW(
}
void cmGlobalMSYSMakefileGenerator::EnableLanguage(
- std::vector<std::string> const& l, cmMakefile* mf, bool optional,
- bool internal)
+ std::vector<std::string> const& l, cmMakefile* mf, bool optional)
{
this->FindMakeProgram(mf);
std::string makeProgram = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
@@ -77,8 +76,7 @@ void cmGlobalMSYSMakefileGenerator::EnableLanguage(
mf->AddDefinition("CMAKE_GENERATOR_CC", gcc.c_str());
mf->AddDefinition("CMAKE_GENERATOR_CXX", gxx.c_str());
mf->AddDefinition("CMAKE_GENERATOR_RC", rc.c_str());
- this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional,
- internal);
+ this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional);
if (!mf->IsSet("CMAKE_AR") && !this->CMakeInstance->GetIsInTryCompile() &&
!(1 == l.size() && l[0] == "NONE")) {
diff --git a/Source/cmGlobalMSYSMakefileGenerator.h b/Source/cmGlobalMSYSMakefileGenerator.h
index 4208e16..d687d19 100644
--- a/Source/cmGlobalMSYSMakefileGenerator.h
+++ b/Source/cmGlobalMSYSMakefileGenerator.h
@@ -42,8 +42,8 @@ public:
* Try to determine system information such as shared library
* extension, pthreads, byte order etc.
*/
- void EnableLanguage(std::vector<std::string> const& languages, cmMakefile*,
- bool optional, bool internal) CM_OVERRIDE;
+ virtual void EnableLanguage(std::vector<std::string> const& languages,
+ cmMakefile*, bool optional);
private:
std::string FindMinGW(std::string const& makeloc);
diff --git a/Source/cmGlobalMinGWMakefileGenerator.cxx b/Source/cmGlobalMinGWMakefileGenerator.cxx
index e61e54b..05f1b36 100644
--- a/Source/cmGlobalMinGWMakefileGenerator.cxx
+++ b/Source/cmGlobalMinGWMakefileGenerator.cxx
@@ -26,8 +26,7 @@ cmGlobalMinGWMakefileGenerator::cmGlobalMinGWMakefileGenerator(cmake* cm)
}
void cmGlobalMinGWMakefileGenerator::EnableLanguage(
- std::vector<std::string> const& l, cmMakefile* mf, bool optional,
- bool internal)
+ std::vector<std::string> const& l, cmMakefile* mf, bool optional)
{
this->FindMakeProgram(mf);
std::string makeProgram = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
@@ -53,8 +52,7 @@ void cmGlobalMinGWMakefileGenerator::EnableLanguage(
mf->AddDefinition("CMAKE_GENERATOR_CC", gcc.c_str());
mf->AddDefinition("CMAKE_GENERATOR_CXX", gxx.c_str());
mf->AddDefinition("CMAKE_GENERATOR_RC", rc.c_str());
- this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional,
- internal);
+ this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional);
}
void cmGlobalMinGWMakefileGenerator::GetDocumentation(
diff --git a/Source/cmGlobalMinGWMakefileGenerator.h b/Source/cmGlobalMinGWMakefileGenerator.h
index 2773dbd..90cfde7 100644
--- a/Source/cmGlobalMinGWMakefileGenerator.h
+++ b/Source/cmGlobalMinGWMakefileGenerator.h
@@ -42,8 +42,8 @@ public:
* Try to determine system information such as shared library
* extension, pthreads, byte order etc.
*/
- void EnableLanguage(std::vector<std::string> const& languages, cmMakefile*,
- bool optional, bool internal) CM_OVERRIDE;
+ virtual void EnableLanguage(std::vector<std::string> const& languages,
+ cmMakefile*, bool optional);
};
#endif
diff --git a/Source/cmGlobalNMakeMakefileGenerator.cxx b/Source/cmGlobalNMakeMakefileGenerator.cxx
index 6216186..605a773 100644
--- a/Source/cmGlobalNMakeMakefileGenerator.cxx
+++ b/Source/cmGlobalNMakeMakefileGenerator.cxx
@@ -30,14 +30,12 @@ cmGlobalNMakeMakefileGenerator::cmGlobalNMakeMakefileGenerator(cmake* cm)
}
void cmGlobalNMakeMakefileGenerator::EnableLanguage(
- std::vector<std::string> const& l, cmMakefile* mf, bool optional,
- bool internal)
+ std::vector<std::string> const& l, cmMakefile* mf, bool optional)
{
// pick a default
mf->AddDefinition("CMAKE_GENERATOR_CC", "cl");
mf->AddDefinition("CMAKE_GENERATOR_CXX", "cl");
- this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional,
- internal);
+ this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional);
}
void cmGlobalNMakeMakefileGenerator::GetDocumentation(
diff --git a/Source/cmGlobalNMakeMakefileGenerator.h b/Source/cmGlobalNMakeMakefileGenerator.h
index 5b0965f..3ab684e 100644
--- a/Source/cmGlobalNMakeMakefileGenerator.h
+++ b/Source/cmGlobalNMakeMakefileGenerator.h
@@ -42,8 +42,8 @@ public:
* Try to determine system information such as shared library
* extension, pthreads, byte order etc.
*/
- void EnableLanguage(std::vector<std::string> const& languages, cmMakefile*,
- bool optional, bool internal) CM_OVERRIDE;
+ virtual void EnableLanguage(std::vector<std::string> const& languages,
+ cmMakefile*, bool optional);
private:
void PrintCompilerAdvice(std::ostream& os, std::string const& lang,
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 4ac7623..81690e7 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -639,10 +639,9 @@ bool cmGlobalNinjaGenerator::CheckFortran(cmMakefile* mf) const
}
void cmGlobalNinjaGenerator::EnableLanguage(
- std::vector<std::string> const& langs, cmMakefile* mf, bool optional,
- bool internal)
+ std::vector<std::string> const& langs, cmMakefile* mf, bool optional)
{
- this->cmGlobalGenerator::EnableLanguage(langs, mf, optional, internal);
+ this->cmGlobalGenerator::EnableLanguage(langs, mf, optional);
for (std::vector<std::string>::const_iterator l = langs.begin();
l != langs.end(); ++l) {
if (*l == "NONE") {
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index 1b3071c..76430a0 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -194,8 +194,8 @@ public:
static void GetDocumentation(cmDocumentationEntry& entry);
- void EnableLanguage(std::vector<std::string> const& languages, cmMakefile*,
- bool optional, bool internal) CM_OVERRIDE;
+ void EnableLanguage(std::vector<std::string> const& languages,
+ cmMakefile* mf, bool optional) CM_OVERRIDE;
void GenerateBuildCommand(std::vector<std::string>& makeCommand,
const std::string& makeProgram,
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index ba0fe00..52ae469 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -53,10 +53,9 @@ cmGlobalUnixMakefileGenerator3::cmGlobalUnixMakefileGenerator3(cmake* cm)
}
void cmGlobalUnixMakefileGenerator3::EnableLanguage(
- std::vector<std::string> const& languages, cmMakefile* mf, bool optional,
- bool internal)
+ std::vector<std::string> const& languages, cmMakefile* mf, bool optional)
{
- this->cmGlobalGenerator::EnableLanguage(languages, mf, optional, internal);
+ this->cmGlobalGenerator::EnableLanguage(languages, mf, optional);
for (std::vector<std::string>::const_iterator l = languages.begin();
l != languages.end(); ++l) {
if (*l == "NONE") {
diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h
index 2c55e1c..3724124 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -105,7 +105,7 @@ public:
* extension, pthreads, byte order etc.
*/
void EnableLanguage(std::vector<std::string> const& languages, cmMakefile*,
- bool optional, bool internal) CM_OVERRIDE;
+ bool optional) CM_OVERRIDE;
void Configure() CM_OVERRIDE;
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index 35baad3..ac9c8ef 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -315,10 +315,9 @@ void cmGlobalVisualStudio10Generator::Generate()
}
void cmGlobalVisualStudio10Generator::EnableLanguage(
- std::vector<std::string> const& lang, cmMakefile* mf, bool optional,
- bool internal)
+ std::vector<std::string> const& lang, cmMakefile* mf, bool optional)
{
- cmGlobalVisualStudio8Generator::EnableLanguage(lang, mf, optional, internal);
+ cmGlobalVisualStudio8Generator::EnableLanguage(lang, mf, optional);
}
const char* cmGlobalVisualStudio10Generator::GetPlatformToolset() const
diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h
index de77ecb..51fd5a5 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -46,8 +46,8 @@ public:
* Try to determine system information such as shared library
* extension, pthreads, byte order etc.
*/
- void EnableLanguage(std::vector<std::string> const& languages, cmMakefile*,
- bool optional, bool internal) CM_OVERRIDE;
+ virtual void EnableLanguage(std::vector<std::string> const& languages,
+ cmMakefile*, bool optional);
virtual void WriteSLNHeader(std::ostream& fout);
/** Generating for Nsight Tegra VS plugin? */
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 911a296..7664b02 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -100,8 +100,7 @@ const char* cmGlobalVisualStudio7Generator::GetIntelProjectVersion()
}
void cmGlobalVisualStudio7Generator::EnableLanguage(
- std::vector<std::string> const& lang, cmMakefile* mf, bool optional,
- bool internal)
+ std::vector<std::string> const& lang, cmMakefile* mf, bool optional)
{
mf->AddDefinition("CMAKE_GENERATOR_RC", "rc");
mf->AddDefinition("CMAKE_GENERATOR_NO_COMPILER_ENV", "1");
@@ -115,7 +114,7 @@ void cmGlobalVisualStudio7Generator::EnableLanguage(
}
// Create list of configurations requested by user's cache, if any.
- this->cmGlobalGenerator::EnableLanguage(lang, mf, optional, internal);
+ this->cmGlobalGenerator::EnableLanguage(lang, mf, optional);
// if this environment variable is set, then copy it to
// a static cache entry. It will be used by
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h
index f80d442..8a33ee0 100644
--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@@ -57,8 +57,8 @@ public:
* Try to determine system information such as shared library
* extension, pthreads, byte order etc.
*/
- void EnableLanguage(std::vector<std::string> const& languages, cmMakefile*,
- bool optional, bool internal) CM_OVERRIDE;
+ virtual void EnableLanguage(std::vector<std::string> const& languages,
+ cmMakefile*, bool optional);
/**
* Try running cmake and building a file. This is used for dynamically
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index 99ed1b8..53a05a0 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -125,8 +125,7 @@ std::string cmGlobalVisualStudio8Generator::FindDevEnvCommand()
}
void cmGlobalVisualStudio8Generator::EnableLanguage(
- std::vector<std::string> const& lang, cmMakefile* mf, bool optional,
- bool internal)
+ std::vector<std::string> const& lang, cmMakefile* mf, bool optional)
{
for (std::vector<std::string>::const_iterator it = lang.begin();
it != lang.end(); ++it) {
@@ -135,7 +134,7 @@ void cmGlobalVisualStudio8Generator::EnableLanguage(
}
}
this->AddPlatformDefinitions(mf);
- cmGlobalVisualStudio7Generator::EnableLanguage(lang, mf, optional, internal);
+ cmGlobalVisualStudio7Generator::EnableLanguage(lang, mf, optional);
}
void cmGlobalVisualStudio8Generator::AddPlatformDefinitions(cmMakefile* mf)
diff --git a/Source/cmGlobalVisualStudio8Generator.h b/Source/cmGlobalVisualStudio8Generator.h
index fa34747..b29106f 100644
--- a/Source/cmGlobalVisualStudio8Generator.h
+++ b/Source/cmGlobalVisualStudio8Generator.h
@@ -32,8 +32,8 @@ public:
/** Get the documentation entry for this generator. */
static void GetDocumentation(cmDocumentationEntry& entry);
- void EnableLanguage(std::vector<std::string> const& languages, cmMakefile*,
- bool optional, bool internal) CM_OVERRIDE;
+ virtual void EnableLanguage(std::vector<std::string> const& languages,
+ cmMakefile*, bool optional);
virtual void AddPlatformDefinitions(cmMakefile* mf);
virtual bool SetGeneratorPlatform(std::string const& p, cmMakefile* mf);
diff --git a/Source/cmGlobalWatcomWMakeGenerator.cxx b/Source/cmGlobalWatcomWMakeGenerator.cxx
index 46427f6..d8f1d93 100644
--- a/Source/cmGlobalWatcomWMakeGenerator.cxx
+++ b/Source/cmGlobalWatcomWMakeGenerator.cxx
@@ -37,8 +37,7 @@ cmGlobalWatcomWMakeGenerator::cmGlobalWatcomWMakeGenerator(cmake* cm)
}
void cmGlobalWatcomWMakeGenerator::EnableLanguage(
- std::vector<std::string> const& l, cmMakefile* mf, bool optional,
- bool internal)
+ std::vector<std::string> const& l, cmMakefile* mf, bool optional)
{
// pick a default
mf->AddDefinition("WATCOM", "1");
@@ -48,8 +47,7 @@ void cmGlobalWatcomWMakeGenerator::EnableLanguage(
mf->AddDefinition("CMAKE_MAKE_SYMBOLIC_RULE", ".SYMBOLIC");
mf->AddDefinition("CMAKE_GENERATOR_CC", "wcl386");
mf->AddDefinition("CMAKE_GENERATOR_CXX", "wcl386");
- this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional,
- internal);
+ this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional);
}
void cmGlobalWatcomWMakeGenerator::GetDocumentation(
diff --git a/Source/cmGlobalWatcomWMakeGenerator.h b/Source/cmGlobalWatcomWMakeGenerator.h
index 87b62bc..df1168e 100644
--- a/Source/cmGlobalWatcomWMakeGenerator.h
+++ b/Source/cmGlobalWatcomWMakeGenerator.h
@@ -52,7 +52,7 @@ public:
* extension, pthreads, byte order etc.
*/
void EnableLanguage(std::vector<std::string> const& languages, cmMakefile*,
- bool optional, bool internal) CM_OVERRIDE;
+ bool optional) CM_OVERRIDE;
bool AllowNotParallel() const CM_OVERRIDE { return false; }
bool AllowDeleteOnError() const CM_OVERRIDE { return false; }
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 0866cc1..0d5de06 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -241,8 +241,7 @@ bool cmGlobalXCodeGenerator::SetGeneratorToolset(std::string const& ts,
}
void cmGlobalXCodeGenerator::EnableLanguage(
- std::vector<std::string> const& lang, cmMakefile* mf, bool optional,
- bool internal)
+ std::vector<std::string> const& lang, cmMakefile* mf, bool optional)
{
mf->AddDefinition("XCODE", "1");
mf->AddDefinition("XCODE_VERSION", this->VersionString.c_str());
@@ -258,7 +257,7 @@ void cmGlobalXCodeGenerator::EnableLanguage(
}
}
mf->AddDefinition("CMAKE_GENERATOR_NO_COMPILER_ENV", "1");
- this->cmGlobalGenerator::EnableLanguage(lang, mf, optional, internal);
+ this->cmGlobalGenerator::EnableLanguage(lang, mf, optional);
const char* osxArch = mf->GetDefinition("CMAKE_OSX_ARCHITECTURES");
const char* sysroot = mf->GetDefinition("CMAKE_OSX_SYSROOT");
if (osxArch && sysroot) {
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index 6766212..ebdba3e 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -48,8 +48,8 @@ public:
* Try to determine system information such as shared library
* extension, pthreads, byte order etc.
*/
- void EnableLanguage(std::vector<std::string> const& languages, cmMakefile*,
- bool optional, bool internal) CM_OVERRIDE;
+ virtual void EnableLanguage(std::vector<std::string> const& languages,
+ cmMakefile*, bool optional);
/**
* Try running cmake and building a file. This is used for dynalically
* loaded commands, not as part of the usual build process.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index b5a6e1d..50e7b33 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3147,11 +3147,11 @@ cmSourceFile* cmMakefile::GetOrCreateSource(const std::string& sourceName,
}
void cmMakefile::EnableLanguage(std::vector<std::string> const& lang,
- bool optional, bool internal)
+ bool optional)
{
this->AddDefinition("CMAKE_CFG_INTDIR",
this->GetGlobalGenerator()->GetCMakeCFGIntDir());
- this->GetGlobalGenerator()->EnableLanguage(lang, this, optional, internal);
+ this->GetGlobalGenerator()->EnableLanguage(lang, this, optional);
}
int cmMakefile::TryCompile(const std::string& srcdir,
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index c7e9927..eb382df 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -574,8 +574,8 @@ public:
///! Enable support for named language, if nil then all languages are
/// enabled.
- void EnableLanguage(std::vector<std::string> const& languages, bool optional,
- bool internal);
+ void EnableLanguage(std::vector<std::string> const& languages,
+ bool optional);
cmState* GetState() const;
diff --git a/Source/cmProjectCommand.cxx b/Source/cmProjectCommand.cxx
index 2b0aac9..6f98d94 100644
--- a/Source/cmProjectCommand.cxx
+++ b/Source/cmProjectCommand.cxx
@@ -199,7 +199,7 @@ bool cmProjectCommand::InitialPass(std::vector<std::string> const& args,
languages.push_back("C");
languages.push_back("CXX");
}
- this->Makefile->EnableLanguage(languages, false, false);
+ this->Makefile->EnableLanguage(languages, false);
std::string extraInclude = "CMAKE_PROJECT_" + args[0] + "_INCLUDE";
const char* include = this->Makefile->GetDefinition(extraInclude);
if (include) {
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index c056fb8..3681843 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -83,17 +83,6 @@ if(BUILD_TESTING)
set(MAKE_SUPPORTS_SPACES 0)
endif()
- # assume no resources building to test
- set(CMake_TEST_RESOURCES FALSE)
- # for windows and cygwin assume we have resources
- if(WIN32 OR CYGWIN)
- set(CMake_TEST_RESOURCES TRUE)
- endif()
- # for borland and watcom there is no resource support
- if(WATCOM OR BORLAND)
- set(CMake_TEST_RESOURCES FALSE)
- endif()
-
set(build_generator_args
--build-generator ${CMAKE_GENERATOR}
)
@@ -273,7 +262,17 @@ if(BUILD_TESTING)
ADD_TEST_MACRO(CompileFeatures CompileFeatures)
ADD_TEST_MACRO(CMakeCommands.target_compile_features target_compile_features)
- if(CMake_TEST_RESOURCES)
+ # assume no resources building to test
+ set(TEST_RESOURCES FALSE)
+ # for windows and cygwin assume we have resources
+ if(WIN32 OR CYGWIN)
+ set(TEST_RESOURCES TRUE)
+ endif()
+ # for borland and watcom there is no resource support
+ if(WATCOM OR BORLAND)
+ set(TEST_RESOURCES FALSE)
+ endif()
+ if(TEST_RESOURCES)
ADD_TEST_MACRO(VSResource VSResource)
if (CMAKE_GENERATOR MATCHES "Ninja")
add_test_macro(VSResourceNinjaForceRSP VSResourceNinjaForceRSP)
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 0eafbef..778982f 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -207,7 +207,7 @@ add_RunCMake_test(include)
add_RunCMake_test(include_directories)
add_RunCMake_test(list)
add_RunCMake_test(message)
-add_RunCMake_test(project -DCMake_TEST_RESOURCES=${CMake_TEST_RESOURCES})
+add_RunCMake_test(project)
add_RunCMake_test(return)
add_RunCMake_test(set_property)
add_RunCMake_test(string)
diff --git a/Tests/RunCMake/project/ExplicitRC.cmake b/Tests/RunCMake/project/ExplicitRC.cmake
deleted file mode 100644
index b3feaa9..0000000
--- a/Tests/RunCMake/project/ExplicitRC.cmake
+++ /dev/null
@@ -1 +0,0 @@
-project(ExplicitRC C RC)
diff --git a/Tests/RunCMake/project/RunCMakeTest.cmake b/Tests/RunCMake/project/RunCMakeTest.cmake
index dba97d2..6ab0fc9 100644
--- a/Tests/RunCMake/project/RunCMakeTest.cmake
+++ b/Tests/RunCMake/project/RunCMakeTest.cmake
@@ -1,8 +1,5 @@
include(RunCMake)
-if(CMake_TEST_RESOURCES)
- run_cmake(ExplicitRC)
-endif()
run_cmake(LanguagesImplicit)
run_cmake(LanguagesEmpty)
run_cmake(LanguagesNONE)
-----------------------------------------------------------------------
Summary of changes:
Modules/Platform/CYGWIN-GNU.cmake | 2 +-
Modules/Platform/Windows-GNU.cmake | 2 +-
Modules/Platform/Windows-MSVC.cmake | 2 +-
Source/cmEnableLanguageCommand.cxx | 5 +----
Source/cmGlobalBorlandMakefileGenerator.cxx | 6 ++----
Source/cmGlobalBorlandMakefileGenerator.h | 4 ++--
Source/cmGlobalGenerator.cxx | 13 +++++--------
Source/cmGlobalGenerator.h | 2 +-
Source/cmGlobalGhsMultiGenerator.cxx | 5 ++---
Source/cmGlobalGhsMultiGenerator.h | 4 ++--
Source/cmGlobalJOMMakefileGenerator.cxx | 6 ++----
Source/cmGlobalJOMMakefileGenerator.h | 4 ++--
Source/cmGlobalMSYSMakefileGenerator.cxx | 6 ++----
Source/cmGlobalMSYSMakefileGenerator.h | 4 ++--
Source/cmGlobalMinGWMakefileGenerator.cxx | 6 ++----
Source/cmGlobalMinGWMakefileGenerator.h | 4 ++--
Source/cmGlobalNMakeMakefileGenerator.cxx | 6 ++----
Source/cmGlobalNMakeMakefileGenerator.h | 4 ++--
Source/cmGlobalNinjaGenerator.cxx | 5 ++---
Source/cmGlobalNinjaGenerator.h | 4 ++--
Source/cmGlobalUnixMakefileGenerator3.cxx | 5 ++---
Source/cmGlobalUnixMakefileGenerator3.h | 2 +-
Source/cmGlobalVisualStudio10Generator.cxx | 5 ++---
Source/cmGlobalVisualStudio10Generator.h | 4 ++--
Source/cmGlobalVisualStudio7Generator.cxx | 5 ++---
Source/cmGlobalVisualStudio7Generator.h | 4 ++--
Source/cmGlobalVisualStudio8Generator.cxx | 5 ++---
Source/cmGlobalVisualStudio8Generator.h | 4 ++--
Source/cmGlobalWatcomWMakeGenerator.cxx | 6 ++----
Source/cmGlobalWatcomWMakeGenerator.h | 2 +-
Source/cmGlobalXCodeGenerator.cxx | 5 ++---
Source/cmGlobalXCodeGenerator.h | 4 ++--
Source/cmMakefile.cxx | 4 ++--
Source/cmMakefile.h | 4 ++--
Source/cmProjectCommand.cxx | 2 +-
Tests/CMakeLists.txt | 23 +++++++++++------------
Tests/RunCMake/CMakeLists.txt | 2 +-
Tests/RunCMake/project/ExplicitRC.cmake | 1 -
Tests/RunCMake/project/RunCMakeTest.cmake | 3 ---
39 files changed, 77 insertions(+), 107 deletions(-)
delete mode 100644 Tests/RunCMake/project/ExplicitRC.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list