diff options
| -rw-r--r-- | Modules/CMakeSystemSpecificInformation.cmake | 2 | ||||
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 25 |
2 files changed, 24 insertions, 3 deletions
diff --git a/Modules/CMakeSystemSpecificInformation.cmake b/Modules/CMakeSystemSpecificInformation.cmake index cd22499620..94e4979e55 100644 --- a/Modules/CMakeSystemSpecificInformation.cmake +++ b/Modules/CMakeSystemSpecificInformation.cmake @@ -143,7 +143,7 @@ IF(CMAKE_USER_MAKE_RULES_OVERRIDE) INCLUDE(${CMAKE_USER_MAKE_RULES_OVERRIDE}) ENDIF(CMAKE_USER_MAKE_RULES_OVERRIDE) -SET(CMAKE_VERBOSE_MAKEFILE FALSE CACHE BOOL "If this value is on, makefiles will be generated without the .SILENT directive, and all commands will be echoed to the console during the make. This is useful for debugging only.") +SET(CMAKE_VERBOSE_MAKEFILE FALSE CACHE BOOL "If this value is on, makefiles will be generated without the .SILENT directive, and all commands will be echoed to the console during the make. This is useful for debugging only. With Visual Studio IDE projects all commands are done without /nologo.") SET (CMAKE_INSTALL_PREFIX /usr/local CACHE PATH "Install path prefix, prepended onto install directories.") diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 987917e51c..4c9c23891b 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -468,6 +468,11 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout, { fout << "\t\t\t\tWarningLevel=\"" << m_Makefile->GetDefinition("CMAKE_CXX_WARNING_LEVEL") << "\"\n"; } + if(m_Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE")) + { + fout << "\t\t\t\tSuppressStartupBanner=\"FALSE\"\n"; + } + if(programDatabase.size()) { fout << programDatabase << "\n"; @@ -566,7 +571,15 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout, fout << "\t\t\t\tOutputFile=\"" << this->ConvertToXMLOutputPathSingle(temp.c_str()) << "\"\n"; fout << "\t\t\t\tLinkIncremental=\"1\"\n"; - fout << "\t\t\t\tSuppressStartupBanner=\"TRUE\"\n"; + if(m_Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE")) + { + fout << "\t\t\t\tSuppressStartupBanner=\"FALSE\"\n"; + } + else + { + fout << "\t\t\t\tSuppressStartupBanner=\"TRUE\"\n"; + } + fout << "\t\t\t\tAdditionalLibraryDirectories=\""; this->OutputLibraryDirectories(fout, configName, libName, target); fout << "\"\n"; @@ -614,7 +627,15 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout, temp += ".exe"; fout << "\t\t\t\tOutputFile=\"" << this->ConvertToXMLOutputPathSingle(temp.c_str()) << "\"\n"; fout << "\t\t\t\tLinkIncremental=\"1\"\n"; - fout << "\t\t\t\tSuppressStartupBanner=\"TRUE\"\n"; + if(m_Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE")) + { + fout << "\t\t\t\tSuppressStartupBanner=\"FALSE\"\n"; + } + else + { + fout << "\t\t\t\tSuppressStartupBanner=\"TRUE\"\n"; + } + fout << "\t\t\t\tAdditionalLibraryDirectories=\""; this->OutputLibraryDirectories(fout, configName, libName, target); fout << "\"\n"; |