diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-09-27 10:09:33 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-09-27 10:09:33 (GMT) |
| commit | 51e4863782f45c0cb8b89c4ae1ddf0a40e366d40 (patch) | |
| tree | 35c050942d430297bd7a05b9ca7a73c6a872c3f9 /Source/cmGlobalVisualStudioGenerator.cxx | |
| parent | 203eada65ea33f5739c99096d18619fbec0ec135 (diff) | |
| download | CMake-51e4863782f45c0cb8b89c4ae1ddf0a40e366d40.zip CMake-51e4863782f45c0cb8b89c4ae1ddf0a40e366d40.tar.gz CMake-51e4863782f45c0cb8b89c4ae1ddf0a40e366d40.tar.bz2 | |
VS: Remove impossible condition.
Diffstat (limited to 'Source/cmGlobalVisualStudioGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudioGenerator.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx index e7cc8ff..7552d67 100644 --- a/Source/cmGlobalVisualStudioGenerator.cxx +++ b/Source/cmGlobalVisualStudioGenerator.cxx @@ -192,7 +192,7 @@ void cmGlobalVisualStudioGenerator::ConfigureCMakeVisualStudioMacros() cmMakefile* mf = this->LocalGenerators[0]->GetMakefile(); std::string dir = this->GetUserMacrosDirectory(); - if (mf != 0 && dir != "") + if (dir != "") { std::string src = mf->GetRequiredDefinition("CMAKE_ROOT"); src += "/Templates/" CMAKE_VSMACROS_FILENAME; @@ -233,13 +233,12 @@ cmGlobalVisualStudioGenerator std::string dir = this->GetUserMacrosDirectory(); // Only really try to call the macro if: - // - mf is non-NULL // - there is a UserMacrosDirectory // - the CMake vsmacros file exists // - the CMake vsmacros file is registered // - there were .sln/.vcproj files changed during generation // - if (mf != 0 && dir != "") + if (dir != "") { std::string macrosFile = dir + "/CMakeMacros/" CMAKE_VSMACROS_FILENAME; std::string nextSubkeyName; |