From 4f59f98b708e7ff7c65857809c76231e58b94e6f Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Thu, 8 Mar 2001 18:24:47 -0500
Subject: ERR: Replaced CMAKE_CFG= with CMAKE_CFG_OUTDIR= to fix windows
behavior.
---
Source/cmMakefile.cxx | 4 ++--
Source/cmUtilitySourceCommand.cxx | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 4ce9322..673762d 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -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
}
diff --git a/Source/cmUtilitySourceCommand.cxx b/Source/cmUtilitySourceCommand.cxx
index 0a8c9b7..32506d0 100644
--- a/Source/cmUtilitySourceCommand.cxx
+++ b/Source/cmUtilitySourceCommand.cxx
@@ -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.
--
cgit v0.12