kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'cmake-internal-info' 

4db08807 CMake: Report whether generators support platforms
43a68a6d cmGlobalGeneratorFactory: Use CM_OVERRIDE for all derived classes
af0e1cd4 Make CMake version dirty state available to code
6a077b5d Make CMake version suffix available to code
This commit is contained in:
Brad King 2016-07-15 09:04:24 -04:00 committed by CMake Topic Stage
parent 0c3fc5a251 4db08807db
commit c59ec2b7c8
17 changed files with 92 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/CMakeVersionCompute.cmake
View File

@ -3,6 +3,7 @@ include(${CMake_SOURCE_DIR}/Source/CMakeVersion.cmake)
# Releases define a small patch level. # Releases define a small patch level.
if("${CMake_VERSION_PATCH}" VERSION_LESS 20000000) if("${CMake_VERSION_PATCH}" VERSION_LESS 20000000)
set(CMake_VERSION_IS_DIRTY 0)
set(CMake_VERSION_IS_RELEASE 1) set(CMake_VERSION_IS_RELEASE 1)
set(CMake_VERSION_SOURCE "") set(CMake_VERSION_SOURCE "")
else() else()
@ -12,9 +13,16 @@ endif()
# Compute the full version string. # Compute the full version string.
set(CMake_VERSION ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}) set(CMake_VERSION ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH})
if(CMake_VERSION_RC)
set(CMake_VERSION ${CMake_VERSION}-rc${CMake_VERSION_RC})
endif()
if(CMake_VERSION_SOURCE) if(CMake_VERSION_SOURCE)
set(CMake_VERSION ${CMake_VERSION}-${CMake_VERSION_SOURCE}) set(CMake_VERSION_SUFFIX "${CMake_VERSION_SOURCE}")
elseif(CMake_VERSION_RC)
set(CMake_VERSION_SUFFIX "rc${CMake_VERSION_RC}")
else()
set(CMake_VERSION_SUFFIX "")
endif()
if(CMake_VERSION_SUFFIX)
set(CMake_VERSION ${CMake_VERSION}-${CMake_VERSION_SUFFIX})
endif()
if(CMake_VERSION_IS_DIRTY)
set(CMake_VERSION ${CMake_VERSION}-dirty)
endif() endif()

4
Source/CMakeVersionSource.cmake
View File

@ -23,7 +23,9 @@ if(EXISTS ${CMake_SOURCE_DIR}/.git/HEAD)
WORKING_DIRECTORY ${CMake_SOURCE_DIR} WORKING_DIRECTORY ${CMake_SOURCE_DIR}
) )
if(dirty) if(dirty)
set(CMake_VERSION_SOURCE "${CMake_VERSION_SOURCE}-dirty") set(CMake_VERSION_IS_DIRTY 1)
else()
set(CMake_VERSION_IS_DIRTY 0)
endif() endif()
endif() endif()
endif() endif()

6
Source/cmGlobalGeneratorFactory.h
View File

@ -41,6 +41,9 @@ public:
/** Determine whether or not this generator supports toolsets */ /** Determine whether or not this generator supports toolsets */
virtual bool SupportsToolset() const = 0; virtual bool SupportsToolset() const = 0;
/** Determine whether or not this generator supports platforms */
virtual bool SupportsPlatform() const = 0;
}; };
template <class T> template <class T>
@ -71,6 +74,9 @@ public:
/** Determine whether or not this generator supports toolsets */ /** Determine whether or not this generator supports toolsets */
bool SupportsToolset() const CM_OVERRIDE { return T::SupportsToolset(); } bool SupportsToolset() const CM_OVERRIDE { return T::SupportsToolset(); }
/** Determine whether or not this generator supports platforms */
bool SupportsPlatform() const CM_OVERRIDE { return T::SupportsPlatform(); }
}; };
#endif #endif

6
Source/cmGlobalGhsMultiGenerator.h
View File

@ -51,6 +51,12 @@ public:
*/ */
static bool SupportsToolset() { return false; } static bool SupportsToolset() { return false; }
/**
* Utilized by the generator factory to determine if this generator
* supports platforms.
*/
static bool SupportsPlatform() { return false; }
/** /**
* Try to determine system information such as shared library * Try to determine system information such as shared library
* extension, pthreads, byte order etc. * extension, pthreads, byte order etc.

6
Source/cmGlobalNinjaGenerator.h
View File

@ -80,6 +80,12 @@ public:
*/ */
static bool SupportsToolset() { return false; } static bool SupportsToolset() { return false; }
/**
* Utilized by the generator factory to determine if this generator
* supports platforms.
*/
static bool SupportsPlatform() { return false; }
/** /**
* Write a build statement to @a os with the @a comment using * Write a build statement to @a os with the @a comment using
* the @a rule the list of @a outputs files and inputs. * the @a rule the list of @a outputs files and inputs.

6
Source/cmGlobalUnixMakefileGenerator3.h
View File

@ -75,6 +75,12 @@ public:
*/ */
static bool SupportsToolset() { return false; } static bool SupportsToolset() { return false; }
/**
* Utilized by the generator factory to determine if this generator
* supports platforms.
*/
static bool SupportsPlatform() { return false; }
/** Get the documentation entry for this generator. */ /** Get the documentation entry for this generator. */
static void GetDocumentation(cmDocumentationEntry& entry); static void GetDocumentation(cmDocumentationEntry& entry);

11
Source/cmGlobalVisualStudio10Generator.cxx
View File

@ -42,8 +42,8 @@ class cmGlobalVisualStudio10Generator::Factory
: public cmGlobalGeneratorFactory : public cmGlobalGeneratorFactory
{ {
public: public:
virtual cmGlobalGenerator* CreateGlobalGenerator(const std::string& name, cmGlobalGenerator* CreateGlobalGenerator(const std::string& name,
cmake* cm) const cmake* cm) const CM_OVERRIDE
{ {
std::string genName; std::string genName;
const char* p = cmVS10GenName(name, genName); const char* p = cmVS10GenName(name, genName);
@ -65,21 +65,22 @@ public:
return 0; return 0;
} }
virtual void GetDocumentation(cmDocumentationEntry& entry) const void GetDocumentation(cmDocumentationEntry& entry) const CM_OVERRIDE
{ {
entry.Name = std::string(vs10generatorName) + " [arch]"; entry.Name = std::string(vs10generatorName) + " [arch]";
entry.Brief = "Generates Visual Studio 2010 project files. " entry.Brief = "Generates Visual Studio 2010 project files. "
"Optional [arch] can be \"Win64\" or \"IA64\"."; "Optional [arch] can be \"Win64\" or \"IA64\".";
} }
virtual void GetGenerators(std::vector<std::string>& names) const void GetGenerators(std::vector<std::string>& names) const CM_OVERRIDE
{ {
names.push_back(vs10generatorName); names.push_back(vs10generatorName);
names.push_back(vs10generatorName + std::string(" IA64")); names.push_back(vs10generatorName + std::string(" IA64"));
names.push_back(vs10generatorName + std::string(" Win64")); names.push_back(vs10generatorName + std::string(" Win64"));
} }
virtual bool SupportsToolset() const { return true; } bool SupportsToolset() const CM_OVERRIDE { return true; }
bool SupportsPlatform() const CM_OVERRIDE { return true; }
}; };
cmGlobalGeneratorFactory* cmGlobalVisualStudio10Generator::NewFactory() cmGlobalGeneratorFactory* cmGlobalVisualStudio10Generator::NewFactory()

11
Source/cmGlobalVisualStudio11Generator.cxx
View File

@ -36,8 +36,8 @@ class cmGlobalVisualStudio11Generator::Factory
: public cmGlobalGeneratorFactory : public cmGlobalGeneratorFactory
{ {
public: public:
virtual cmGlobalGenerator* CreateGlobalGenerator(const std::string& name, cmGlobalGenerator* CreateGlobalGenerator(const std::string& name,
cmake* cm) const cmake* cm) const CM_OVERRIDE
{ {
std::string genName; std::string genName;
const char* p = cmVS11GenName(name, genName); const char* p = cmVS11GenName(name, genName);
@ -70,14 +70,14 @@ public:
return ret; return ret;
} }
virtual void GetDocumentation(cmDocumentationEntry& entry) const void GetDocumentation(cmDocumentationEntry& entry) const CM_OVERRIDE
{ {
entry.Name = std::string(vs11generatorName) + " [arch]"; entry.Name = std::string(vs11generatorName) + " [arch]";
entry.Brief = "Generates Visual Studio 2012 project files. " entry.Brief = "Generates Visual Studio 2012 project files. "
"Optional [arch] can be \"Win64\" or \"ARM\"."; "Optional [arch] can be \"Win64\" or \"ARM\".";
} }
virtual void GetGenerators(std::vector<std::string>& names) const void GetGenerators(std::vector<std::string>& names) const CM_OVERRIDE
{ {
names.push_back(vs11generatorName); names.push_back(vs11generatorName);
names.push_back(vs11generatorName + std::string(" ARM")); names.push_back(vs11generatorName + std::string(" ARM"));
@ -91,7 +91,8 @@ public:
} }
} }
virtual bool SupportsToolset() const { return true; } bool SupportsToolset() const CM_OVERRIDE { return true; }
bool SupportsPlatform() const CM_OVERRIDE { return true; }
}; };
cmGlobalGeneratorFactory* cmGlobalVisualStudio11Generator::NewFactory() cmGlobalGeneratorFactory* cmGlobalVisualStudio11Generator::NewFactory()

11
Source/cmGlobalVisualStudio12Generator.cxx
View File

@ -36,8 +36,8 @@ class cmGlobalVisualStudio12Generator::Factory
: public cmGlobalGeneratorFactory : public cmGlobalGeneratorFactory
{ {
public: public:
virtual cmGlobalGenerator* CreateGlobalGenerator(const std::string& name, cmGlobalGenerator* CreateGlobalGenerator(const std::string& name,
cmake* cm) const cmake* cm) const CM_OVERRIDE
{ {
std::string genName; std::string genName;
const char* p = cmVS12GenName(name, genName); const char* p = cmVS12GenName(name, genName);
@ -59,21 +59,22 @@ public:
return 0; return 0;
} }
virtual void GetDocumentation(cmDocumentationEntry& entry) const void GetDocumentation(cmDocumentationEntry& entry) const CM_OVERRIDE
{ {
entry.Name = std::string(vs12generatorName) + " [arch]"; entry.Name = std::string(vs12generatorName) + " [arch]";
entry.Brief = "Generates Visual Studio 2013 project files. " entry.Brief = "Generates Visual Studio 2013 project files. "
"Optional [arch] can be \"Win64\" or \"ARM\"."; "Optional [arch] can be \"Win64\" or \"ARM\".";
} }
virtual void GetGenerators(std::vector<std::string>& names) const void GetGenerators(std::vector<std::string>& names) const CM_OVERRIDE
{ {
names.push_back(vs12generatorName); names.push_back(vs12generatorName);
names.push_back(vs12generatorName + std::string(" ARM")); names.push_back(vs12generatorName + std::string(" ARM"));
names.push_back(vs12generatorName + std::string(" Win64")); names.push_back(vs12generatorName + std::string(" Win64"));
} }
virtual bool SupportsToolset() const { return true; } bool SupportsToolset() const CM_OVERRIDE { return true; }
bool SupportsPlatform() const CM_OVERRIDE { return true; }
}; };
cmGlobalGeneratorFactory* cmGlobalVisualStudio12Generator::NewFactory() cmGlobalGeneratorFactory* cmGlobalVisualStudio12Generator::NewFactory()

11
Source/cmGlobalVisualStudio14Generator.cxx
View File

@ -36,8 +36,8 @@ class cmGlobalVisualStudio14Generator::Factory
: public cmGlobalGeneratorFactory : public cmGlobalGeneratorFactory
{ {
public: public:
virtual cmGlobalGenerator* CreateGlobalGenerator(const std::string& name, cmGlobalGenerator* CreateGlobalGenerator(const std::string& name,
cmake* cm) const cmake* cm) const CM_OVERRIDE
{ {
std::string genName; std::string genName;
const char* p = cmVS14GenName(name, genName); const char* p = cmVS14GenName(name, genName);
@ -59,21 +59,22 @@ public:
return 0; return 0;
} }
virtual void GetDocumentation(cmDocumentationEntry& entry) const void GetDocumentation(cmDocumentationEntry& entry) const CM_OVERRIDE
{ {
entry.Name = std::string(vs14generatorName) + " [arch]"; entry.Name = std::string(vs14generatorName) + " [arch]";
entry.Brief = "Generates Visual Studio 2015 project files. " entry.Brief = "Generates Visual Studio 2015 project files. "
"Optional [arch] can be \"Win64\" or \"ARM\"."; "Optional [arch] can be \"Win64\" or \"ARM\".";
} }
virtual void GetGenerators(std::vector<std::string>& names) const void GetGenerators(std::vector<std::string>& names) const CM_OVERRIDE
{ {
names.push_back(vs14generatorName); names.push_back(vs14generatorName);
names.push_back(vs14generatorName + std::string(" ARM")); names.push_back(vs14generatorName + std::string(" ARM"));
names.push_back(vs14generatorName + std::string(" Win64")); names.push_back(vs14generatorName + std::string(" Win64"));
} }
virtual bool SupportsToolset() const { return true; } bool SupportsToolset() const CM_OVERRIDE { return true; }
bool SupportsPlatform() const CM_OVERRIDE { return true; }
}; };
cmGlobalGeneratorFactory* cmGlobalVisualStudio14Generator::NewFactory() cmGlobalGeneratorFactory* cmGlobalVisualStudio14Generator::NewFactory()

6
Source/cmGlobalVisualStudio7Generator.h
View File

@ -47,6 +47,12 @@ public:
*/ */
static bool SupportsToolset() { return false; } static bool SupportsToolset() { return false; }
/**
* Utilized by the generator factory to determine if this generator
* supports platforms.
*/
static bool SupportsPlatform() { return false; }
/** /**
* Try to determine system information such as shared library * Try to determine system information such as shared library
* extension, pthreads, byte order etc. * extension, pthreads, byte order etc.

11
Source/cmGlobalVisualStudio8Generator.cxx
View File

@ -25,8 +25,8 @@ static const char vs8generatorName[] = "Visual Studio 8 2005";
class cmGlobalVisualStudio8Generator::Factory : public cmGlobalGeneratorFactory class cmGlobalVisualStudio8Generator::Factory : public cmGlobalGeneratorFactory
{ {
public: public:
virtual cmGlobalGenerator* CreateGlobalGenerator(const std::string& name, cmGlobalGenerator* CreateGlobalGenerator(const std::string& name,
cmake* cm) const cmake* cm) const CM_OVERRIDE
{ {
if (strncmp(name.c_str(), vs8generatorName, if (strncmp(name.c_str(), vs8generatorName,
sizeof(vs8generatorName) - 1) != 0) { sizeof(vs8generatorName) - 1) != 0) {
@ -60,14 +60,14 @@ public:
return ret; return ret;
} }
virtual void GetDocumentation(cmDocumentationEntry& entry) const void GetDocumentation(cmDocumentationEntry& entry) const CM_OVERRIDE
{ {
entry.Name = std::string(vs8generatorName) + " [arch]"; entry.Name = std::string(vs8generatorName) + " [arch]";
entry.Brief = "Generates Visual Studio 2005 project files. " entry.Brief = "Generates Visual Studio 2005 project files. "
"Optional [arch] can be \"Win64\"."; "Optional [arch] can be \"Win64\".";
} }
virtual void GetGenerators(std::vector<std::string>& names) const void GetGenerators(std::vector<std::string>& names) const CM_OVERRIDE
{ {
names.push_back(vs8generatorName); names.push_back(vs8generatorName);
names.push_back(vs8generatorName + std::string(" Win64")); names.push_back(vs8generatorName + std::string(" Win64"));
@ -82,7 +82,8 @@ public:
} }
} }
virtual bool SupportsToolset() const { return false; } bool SupportsToolset() const CM_OVERRIDE { return false; }
bool SupportsPlatform() const CM_OVERRIDE { return true; }
}; };
cmGlobalGeneratorFactory* cmGlobalVisualStudio8Generator::NewFactory() cmGlobalGeneratorFactory* cmGlobalVisualStudio8Generator::NewFactory()

11
Source/cmGlobalVisualStudio9Generator.cxx
View File

@ -23,8 +23,8 @@ static const char vs9generatorName[] = "Visual Studio 9 2008";
class cmGlobalVisualStudio9Generator::Factory : public cmGlobalGeneratorFactory class cmGlobalVisualStudio9Generator::Factory : public cmGlobalGeneratorFactory
{ {
public: public:
virtual cmGlobalGenerator* CreateGlobalGenerator(const std::string& name, cmGlobalGenerator* CreateGlobalGenerator(const std::string& name,
cmake* cm) const cmake* cm) const CM_OVERRIDE
{ {
if (strncmp(name.c_str(), vs9generatorName, if (strncmp(name.c_str(), vs9generatorName,
sizeof(vs9generatorName) - 1) != 0) { sizeof(vs9generatorName) - 1) != 0) {
@ -62,14 +62,14 @@ public:
return ret; return ret;
} }
virtual void GetDocumentation(cmDocumentationEntry& entry) const void GetDocumentation(cmDocumentationEntry& entry) const CM_OVERRIDE
{ {
entry.Name = std::string(vs9generatorName) + " [arch]"; entry.Name = std::string(vs9generatorName) + " [arch]";
entry.Brief = "Generates Visual Studio 2008 project files. " entry.Brief = "Generates Visual Studio 2008 project files. "
"Optional [arch] can be \"Win64\" or \"IA64\"."; "Optional [arch] can be \"Win64\" or \"IA64\".";
} }
virtual void GetGenerators(std::vector<std::string>& names) const void GetGenerators(std::vector<std::string>& names) const CM_OVERRIDE
{ {
names.push_back(vs9generatorName); names.push_back(vs9generatorName);
names.push_back(vs9generatorName + std::string(" Win64")); names.push_back(vs9generatorName + std::string(" Win64"));
@ -85,7 +85,8 @@ public:
} }
} }
virtual bool SupportsToolset() const { return false; } bool SupportsToolset() const CM_OVERRIDE { return false; }
bool SupportsPlatform() const CM_OVERRIDE { return true; }
}; };
cmGlobalGeneratorFactory* cmGlobalVisualStudio9Generator::NewFactory() cmGlobalGeneratorFactory* cmGlobalVisualStudio9Generator::NewFactory()

11
Source/cmGlobalXCodeGenerator.cxx
View File

@ -108,20 +108,21 @@ public:
class cmGlobalXCodeGenerator::Factory : public cmGlobalGeneratorFactory class cmGlobalXCodeGenerator::Factory : public cmGlobalGeneratorFactory
{ {
public: public:
virtual cmGlobalGenerator* CreateGlobalGenerator(const std::string& name, cmGlobalGenerator* CreateGlobalGenerator(const std::string& name,
cmake* cm) const; cmake* cm) const CM_OVERRIDE;
virtual void GetDocumentation(cmDocumentationEntry& entry) const void GetDocumentation(cmDocumentationEntry& entry) const CM_OVERRIDE
{ {
cmGlobalXCodeGenerator::GetDocumentation(entry); cmGlobalXCodeGenerator::GetDocumentation(entry);
} }
virtual void GetGenerators(std::vector<std::string>& names) const void GetGenerators(std::vector<std::string>& names) const CM_OVERRIDE
{ {
names.push_back(cmGlobalXCodeGenerator::GetActualName()); names.push_back(cmGlobalXCodeGenerator::GetActualName());
} }
virtual bool SupportsToolset() const { return true; } bool SupportsToolset() const CM_OVERRIDE { return true; }
bool SupportsPlatform() const CM_OVERRIDE { return false; }
}; };
cmGlobalXCodeGenerator::cmGlobalXCodeGenerator(cmake* cm, cmGlobalXCodeGenerator::cmGlobalXCodeGenerator(cmake* cm,

2
Source/cmVersionConfig.h.in
View File

@ -12,4 +12,6 @@
#define CMake_VERSION_MAJOR @CMake_VERSION_MAJOR@ #define CMake_VERSION_MAJOR @CMake_VERSION_MAJOR@
#define CMake_VERSION_MINOR @CMake_VERSION_MINOR@ #define CMake_VERSION_MINOR @CMake_VERSION_MINOR@
#define CMake_VERSION_PATCH @CMake_VERSION_PATCH@ #define CMake_VERSION_PATCH @CMake_VERSION_PATCH@
#define CMake_VERSION_SUFFIX "@CMake_VERSION_SUFFIX@"
#define CMake_VERSION_IS_DIRTY @CMake_VERSION_IS_DIRTY@
#define CMake_VERSION "@CMake_VERSION@" #define CMake_VERSION "@CMake_VERSION@"

2
Source/cmake.cxx
View File

@ -853,6 +853,7 @@ void cmake::GetRegisteredGenerators(std::vector<GeneratorInfo>& generators)
for (size_t j = 0; j < names.size(); ++j) { for (size_t j = 0; j < names.size(); ++j) {
GeneratorInfo info; GeneratorInfo info;
info.supportsToolset = (*i)->SupportsToolset(); info.supportsToolset = (*i)->SupportsToolset();
info.supportsPlatform = (*i)->SupportsPlatform();
info.name = names[j]; info.name = names[j];
generators.push_back(info); generators.push_back(info);
} }
@ -865,6 +866,7 @@ void cmake::GetRegisteredGenerators(std::vector<GeneratorInfo>& generators)
GeneratorInfo info; GeneratorInfo info;
info.name = i->first; info.name = i->first;
info.supportsToolset = false; info.supportsToolset = false;
info.supportsPlatform = false;
generators.push_back(info); generators.push_back(info);
} }
} }

1
Source/cmake.h
View File

@ -104,6 +104,7 @@ public:
{ {
std::string name; std::string name;
bool supportsToolset; bool supportsToolset;
bool supportsPlatform;
}; };
typedef std::map<std::string, cmInstalledFile> InstalledFilesMap; typedef std::map<std::string, cmInstalledFile> InstalledFilesMap;