[cmake-commits] hoffman committed cmake.cxx 1.360 1.361 cmConfigure.cmake.h.in 1.12 1.13

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv30739

Modified Files:
	cmake.cxx cmConfigure.cmake.h.in 
Log Message:
ENH: remove CMAKE_PREFIX so changing it does not rebuild all


Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -d -r1.360 -r1.361
--- cmake.cxx	14 Feb 2008 21:42:29 -0000	1.360
+++ cmake.cxx	18 Feb 2008 18:03:40 -0000	1.361
@@ -842,14 +842,6 @@
     modules = cMakeRoot + "/Modules/CMake.cmake";
     }
 #endif
-#ifdef CMAKE_PREFIX
-  if (!cmSystemTools::FileExists(modules.c_str()))
-    {
-    // try compiled in install prefix
-    cMakeRoot = CMAKE_PREFIX CMAKE_DATA_DIR;
-    modules = cMakeRoot + "/Modules/CMake.cmake";
-    }
-#endif
   if (!cmSystemTools::FileExists(modules.c_str()))
     {
     // try

Index: cmConfigure.cmake.h.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmConfigure.cmake.h.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- cmConfigure.cmake.h.in	16 Oct 2007 18:28:12 -0000	1.12
+++ cmConfigure.cmake.h.in	18 Feb 2008 18:03:40 -0000	1.13
@@ -23,7 +23,6 @@
 #cmakedefine CMAKE_STRICT
 #define  CMAKE_ROOT_DIR "${CMake_SOURCE_DIR}"
 #define  CMAKE_BUILD_DIR "${CMake_BINARY_DIR}"
-#define  CMAKE_PREFIX "${CMAKE_INSTALL_PREFIX}"
 
 #define CMake_VERSION_MAJOR @CMake_VERSION_MAJOR@
 #define CMake_VERSION_MINOR @CMake_VERSION_MINOR@