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

ERR: Replaced CMAKE_CFG= with CMAKE_CFG_OUTDIR= to fix windows behavior.

This commit is contained in:
Brad King 2001-03-08 18:24:47 -05:00
parent 1b6afc5c53
commit 4f59f98b70
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmMakefile.cxx
View File

@ -533,8 +533,8 @@ void cmMakefile::GenerateCacheOnly()
void cmMakefile::AddDefaultDefinitions()
{
#if defined(_WIN32) && !defined(__CYGWIN__)
this->AddDefinition("CMAKE_CFG","$(CFG)");
this->AddDefinition("CMAKE_CFG_OUTDIR","$(OUTDIR)");
#else
this->AddDefinition("CMAKE_CFG",".");
this->AddDefinition("CMAKE_CFG_OUTDIR",".");
#endif
}

4
Source/cmUtilitySourceCommand.cxx
View File

@ -62,10 +62,10 @@ bool cmUtilitySourceCommand::Invoke(std::vector<std::string>& args)
// The source exists. Construct the cache entry for the executable's
// location.
std::string cmakeCFG = m_Makefile->GetDefinition("CMAKE_CFG");
std::string cmakeCFGout = m_Makefile->GetDefinition("CMAKE_CFG_OUTDIR");
std::string utilityExecutable = m_Makefile->GetCurrentOutputDirectory();
utilityExecutable =
(utilityExecutable+"/"+relativeSource+"/"+cmakeCFG+"/"
(utilityExecutable+"/"+relativeSource+"/"+cmakeCFGout+"/"
+utilityName+cmSystemTools::GetExecutableExtension());
// Enter the value into the cache.