diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2004-06-28 20:39:51 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2004-06-28 20:39:51 (GMT) |
| commit | ed0999c9d1c60bdb5be4354e068a95936819b996 (patch) | |
| tree | a03f9f3c55a84c0a33dca7e8a479a8eee835eff7 /Source | |
| parent | f9b43b9212b1ae2ba4dd9c4f609f8d5093421398 (diff) | |
| download | CMake-ed0999c9d1c60bdb5be4354e068a95936819b996.zip CMake-ed0999c9d1c60bdb5be4354e068a95936819b996.tar.gz CMake-ed0999c9d1c60bdb5be4354e068a95936819b996.tar.bz2 | |
ERR: Fix visual studio install
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmFileCommand.cxx | 16 | ||||
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 4 |
2 files changed, 17 insertions, 3 deletions
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 1b49ff7..c178059 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -249,6 +249,8 @@ bool cmFileCommand::HandleInstallCommand( std::string destination = ""; std::string stype = "FILES"; const char* build_type = m_Makefile->GetDefinition("BUILD_TYPE"); + const char* debug_postfix + = m_Makefile->GetDefinition("CMAKE_DEBUG_POSTFIX"); const char* destdir = cmSystemTools::GetEnv("DESTDIR"); std::string extra_dir = ""; @@ -451,6 +453,10 @@ bool cmFileCommand::HandleInstallCommand( case cmTarget::MODULE_LIBRARY: case cmTarget::STATIC_LIBRARY: case cmTarget::SHARED_LIBRARY: + if ( debug ) + { + fname = fnamewe + debug_postfix + ext; + } { // Handle shared library versioning const char* lib_version = 0; @@ -506,11 +512,15 @@ bool cmFileCommand::HandleInstallCommand( } } cmOStringStream str; - str << cmSystemTools::GetFilenamePath(ctarget) - << "/" << extra_dir << "/" - << fname; + str << cmSystemTools::GetFilenamePath(ctarget) << "/"; + if ( extra_dir.size() > 0 ) + { + str << extra_dir << "/"; + } + str << fname; ctarget = str.str(); } + break; case cmTarget::EXECUTABLE: if ( extra_dir.size() > 0 ) { diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 1315bb6..14c78e8 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -482,14 +482,18 @@ int cmGlobalGenerator::TryCompile(const char *, const char *bindir, } int retVal; int timeout = cmGlobalGenerator::s_TryCompileTimeout; + bool hideconsole = cmSystemTools::GetRunCommandHideConsole(); + cmSystemTools::SetRunCommandHideConsole(true); if (!cmSystemTools::RunSingleCommand(makeCommand.c_str(), output, &retVal, 0, false, timeout)) { + cmSystemTools::SetRunCommandHideConsole(hideconsole); cmSystemTools::Error("Generator: execution of make failed."); // return to the original directory cmSystemTools::ChangeDirectory(cwd.c_str()); return 1; } + cmSystemTools::SetRunCommandHideConsole(hideconsole); // The SGI MipsPro 7.3 compiler does not return an error code when // the source has a #error in it! This is a work-around for such |