Browse Source

compile source dir into cmake

Bill Hoffman 24 years ago
parent
commit
a8ccbf7c21
2 changed files with 5 additions and 12 deletions
  1. 4 11
      Source/CMakeBuildTargets.cxx
  2. 1 1
      Source/Makefile.in

+ 4 - 11
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]);

+ 1 - 1
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