From a8ccbf7c21cf9125217f53969e89aa082fcf8b19 Mon Sep 17 00:00:00 2001
From: Bill Hoffman <bill.hoffman@kitware.com>
Date: Thu, 17 May 2001 17:43:29 -0400
Subject: compile source dir into cmake

---
 Source/CMakeBuildTargets.cxx | 15 ++++-----------
 Source/Makefile.in           |  2 +-
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/Source/CMakeBuildTargets.cxx b/Source/CMakeBuildTargets.cxx
index 057f149..e65be07 100644
--- a/Source/CMakeBuildTargets.cxx
+++ b/Source/CMakeBuildTargets.cxx
@@ -65,18 +65,8 @@ int main(int ac, char** av)
     Usage(av[0]);
     return -1;
     }
-
   // set the cmake root directory
-  std::string root = cmSystemTools::GetProgramPath(av[0]);
-  std::string::size_type slashPos = root.rfind("/");
-  if(slashPos != std::string::npos)      
-    {
-    root = root.substr(0, slashPos);
-    }
-  cmCacheManager::GetInstance()->AddCacheEntry
-    ("CMAKE_ROOT", root.c_str(),
-     "Path to CMake installation.", cmCacheManager::INTERNAL);
-
+  std::string root = CMAKE_ROOT_DIR;
 
   // Create a makefile
   cmMakefile mf;
@@ -138,6 +128,9 @@ int main(int ac, char** av)
   // Read and parse the input makefile
   mf.MakeStartDirectoriesCurrent();
   cmCacheManager::GetInstance()->LoadCache(&mf);
+  cmCacheManager::GetInstance()->AddCacheEntry
+    ("CMAKE_ROOT", root.c_str(),
+     "Path to CMake installation.", cmCacheManager::INTERNAL);
   
   // Find our own exectuable.
   std::string cMakeSelf = cmSystemTools::FindProgram(av[0]);
diff --git a/Source/Makefile.in b/Source/Makefile.in
index 4fce232..4b68a2b 100644
--- a/Source/Makefile.in
+++ b/Source/Makefile.in
@@ -3,7 +3,7 @@ VPATH         = @srcdir@
 
 CMAKE_CONFIG_DIR = @CMAKE_CONFIG_DIR@
 CXX           = @CXX@
-CXXFLAGS      = @CXXFLAGS@ -DCMAKE_HAS_AUTOCONF -I${CMAKE_CONFIG_DIR}/CMake/Source
+CXXFLAGS      = -DCMAKE_ROOT_DIR='"@CMAKE_ROOT_DIR@"' @CXXFLAGS@ -DCMAKE_HAS_AUTOCONF -I${CMAKE_CONFIG_DIR}/CMake/Source
 
 .SUFFIXES: .cxx .java .class
 
-- 
cgit v0.12