From 6c54371c8f0c341fff060ddf02ed0ba5ea37d25f Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Fri, 4 May 2001 10:44:26 -0400
Subject: ENH: Added use of CMAKE cache entry for generating the DSP/makefile
 build rules.

---
 Source/cmCablePackageCommand.cxx | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/Source/cmCablePackageCommand.cxx b/Source/cmCablePackageCommand.cxx
index 98febc8..ea96fe0 100644
--- a/Source/cmCablePackageCommand.cxx
+++ b/Source/cmCablePackageCommand.cxx
@@ -76,22 +76,11 @@ bool cmCablePackageCommand::Invoke(std::vector<std::string>& args)
   std::string cMakeLists = m_Makefile->GetStartDirectory();
   cMakeLists += "/";
   cMakeLists += "CMakeLists.txt";
+  cMakeLists = cmSystemTools::EscapeSpaces(cMakeLists.c_str());
 
-  std::string command;
+  std::string command = "${CMAKE} "+cMakeLists;
 #if defined(_WIN32) && !defined(__CYGWIN__)
-  cMakeLists = "\""+cMakeLists+"\"";
-  command = "\"";
-  command += m_Makefile->GetHomeDirectory();
-  command += "/CMake/Source/CMakeSetupCMD\" \"";
-  command += cMakeLists;
-  command += "\" -DSP";
-#else
-  cMakeLists = cmSystemTools::EscapeSpaces(cMakeLists.c_str());
-  command = "\"";
-  command += m_Makefile->GetHomeOutputDirectory();  
-  command += "/CMake/Source/CMakeBuildTargets\" \"";
-  command += cMakeLists;
-  command += "\"";
+  command += " -DSP";
 #endif
   command += " -H\"";
   command += m_Makefile->GetHomeDirectory();
@@ -102,6 +91,7 @@ bool cmCablePackageCommand::Invoke(std::vector<std::string>& args)
   command += "\" -B\"";
   command += m_Makefile->GetHomeOutputDirectory();
   command += "\"";
+  m_Makefile->ExpandVariablesInString(command);
 
   std::vector<std::string> depends;
   m_Makefile->AddCustomCommand(cMakeLists.c_str(), 
-- 
cgit v0.12