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

VS: Remove impossible condition.

Browse Source
This commit is contained in:
Stephen Kelly 2015-09-27 12:09:33 +02:00
parent 203eada65e
commit 51e4863782
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmGlobalVisualStudioGenerator.cxx
View File

@ -192,7 +192,7 @@ void cmGlobalVisualStudioGenerator::ConfigureCMakeVisualStudioMacros()
cmMakefile* mf = this->LocalGenerators[0]->GetMakefile(); cmMakefile* mf = this->LocalGenerators[0]->GetMakefile();
std::string dir = this->GetUserMacrosDirectory(); std::string dir = this->GetUserMacrosDirectory();
if (mf != 0 && dir != "") if (dir != "")
{ {
std::string src = mf->GetRequiredDefinition("CMAKE_ROOT"); std::string src = mf->GetRequiredDefinition("CMAKE_ROOT");
src += "/Templates/" CMAKE_VSMACROS_FILENAME; src += "/Templates/" CMAKE_VSMACROS_FILENAME;
@ -233,13 +233,12 @@ cmGlobalVisualStudioGenerator
std::string dir = this->GetUserMacrosDirectory(); std::string dir = this->GetUserMacrosDirectory();
// Only really try to call the macro if: // Only really try to call the macro if:
// - mf is non-NULL
// - there is a UserMacrosDirectory // - there is a UserMacrosDirectory
// - the CMake vsmacros file exists // - the CMake vsmacros file exists
// - the CMake vsmacros file is registered // - the CMake vsmacros file is registered
// - there were .sln/.vcproj files changed during generation // - there were .sln/.vcproj files changed during generation
// //
if (mf != 0 && dir != "") if (dir != "")
{ {
std::string macrosFile = dir + "/CMakeMacros/" CMAKE_VSMACROS_FILENAME; std::string macrosFile = dir + "/CMakeMacros/" CMAKE_VSMACROS_FILENAME;
std::string nextSubkeyName; std::string nextSubkeyName;