[cmake-commits] king committed bootstrap 1.91 1.92

[cmake-commits at cmake.org]

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

Modified Files:
	bootstrap 
Log Message:
ENH: Adding option to use system-installed third-party libraries.  This addresses bug#3653.


Index: bootstrap
===================================================================
RCS file: /cvsroot/CMake/CMake/bootstrap,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- bootstrap	4 Oct 2006 21:24:36 -0000	1.91
+++ bootstrap	19 Oct 2006 19:17:58 -0000	1.92
@@ -36,6 +36,7 @@
 cmake_doc_dir="/doc/cmake-${cmake_version}"
 cmake_man_dir="/man"
 cmake_init_file=""
+cmake_bootstrap_system_libs=""
 
 # Determine whether this is a MinGW environment.
 if echo "${cmake_system}" | grep MINGW >/dev/null 2>&1; then
@@ -205,6 +206,10 @@
   --parallel=n            bootstrap cmake in parallel, where n is
                           number of nodes [1]
   --init=FILE             use FILE for cmake initialization
+  --system-libs           use system-installed third-party libraries
+                          (for use only by package maintainers)
+  --no-system-libs        use cmake-provided third-party libraries
+                          (default)
 
 Directory and file names:
   --prefix=PREFIX         install files in tree rooted at PREFIX
@@ -444,6 +449,12 @@
   if echo $a | grep "^--init=" > /dev/null 2> /dev/null; then
     cmake_init_file=`echo $a | sed "s/^--init=//"`
   fi
+  if echo $a | grep "^--system-libs" > /dev/null 2> /dev/null; then
+    cmake_bootstrap_system_libs="-DCMAKE_USE_SYSTEM_LIBRARIES=1"
+  fi
+  if echo $a | grep "^--no-system-libs" > /dev/null 2> /dev/null; then
+    cmake_bootstrap_system_libs="-DCMAKE_USE_SYSTEM_LIBRARIES=0"
+  fi
   if echo $a | grep "^--help" > /dev/null 2> /dev/null; then
     cmake_usage
   fi
@@ -1287,7 +1298,7 @@
 export MAKE
 
 # Run bootstrap CMake to configure real CMake
-"${cmake_bootstrap_dir}/cmake" "${cmake_source_dir}" "-C${cmake_bootstrap_dir}/InitialCacheFlags.cmake" "-G${cmake_bootstrap_generator}"
+"${cmake_bootstrap_dir}/cmake" "${cmake_source_dir}" "-C${cmake_bootstrap_dir}/InitialCacheFlags.cmake" "-G${cmake_bootstrap_generator}" ${cmake_bootstrap_system_libs}
 RES=$?
 if [ "${RES}" -ne "0" ]; then
   cmake_error 11 "Problem while running initial CMake"