summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalVisualStudio14Generator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-07-17 20:16:10 (GMT)
committerBrad King <brad.king@kitware.com>2014-07-17 20:17:35 (GMT)
commiteeb60102e813c6c69546e4257a332ede4e234171 (patch)
treef9860ee64eb4ea96425ba99a5c3bcec42d99402a /Source/cmGlobalVisualStudio14Generator.cxx
parentecb34faaaba841aac6dae722dd2c6256a1472d74 (diff)
downloadCMake-eeb60102e813c6c69546e4257a332ede4e234171.zip
CMake-eeb60102e813c6c69546e4257a332ede4e234171.tar.gz
CMake-eeb60102e813c6c69546e4257a332ede4e234171.tar.bz2
VS: Refactor CMAKE_FORCE_*64 platform definitions
Remove the general infrastructure for these additional platform definitions and hard-code the only two special cases that used it. They are only for historical reasons so no new such cases should be added.
Diffstat (limited to 'Source/cmGlobalVisualStudio14Generator.cxx')
-rw-r--r--Source/cmGlobalVisualStudio14Generator.cxx12
1 files changed, 5 insertions, 7 deletions
diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx
index 9bde0ad..076b057 100644
--- a/Source/cmGlobalVisualStudio14Generator.cxx
+++ b/Source/cmGlobalVisualStudio14Generator.cxx
@@ -31,19 +31,19 @@ public:
if(!*p)
{
return new cmGlobalVisualStudio14Generator(
- genName, "", "");
+ genName, "");
}
if(*p++ != ' ')
{ return 0; }
if(strcmp(p, "Win64") == 0)
{
return new cmGlobalVisualStudio14Generator(
- genName, "x64", "CMAKE_FORCE_WIN64");
+ genName, "x64");
}
if(strcmp(p, "ARM") == 0)
{
return new cmGlobalVisualStudio14Generator(
- genName, "ARM", "");
+ genName, "ARM");
}
return 0;
}
@@ -70,10 +70,8 @@ cmGlobalGeneratorFactory* cmGlobalVisualStudio14Generator::NewFactory()
//----------------------------------------------------------------------------
cmGlobalVisualStudio14Generator::cmGlobalVisualStudio14Generator(
- const std::string& name, const std::string& platformName,
- const std::string& additionalPlatformDefinition)
- : cmGlobalVisualStudio12Generator(name, platformName,
- additionalPlatformDefinition)
+ const std::string& name, const std::string& platformName)
+ : cmGlobalVisualStudio12Generator(name, platformName)
{
std::string vc14Express;
this->ExpressEdition = cmSystemTools::ReadRegistryValue(