[cmake-commits] king committed bootstrap 1.108 1.109

[cmake-commits at cmake.org]

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

Modified Files:
	bootstrap 
Log Message:
ENH: Add option to bootstrap script to enable Qt dialog.

  - Add --qt-gui and --no-qt-gui options
  - Add --qt-qmake=<qmake> option to help locate Qt
  - Build more commands during bootstrap to help FindQt4.cmake:
    MATH, GET_DIRECTORY_PROPERTY, EXECUTE_PROCESS,
    SEPARATE_ARGUMENTS
  - Bootstrapping with the cmake-gui is now possible in MSys


Index: bootstrap
===================================================================
RCS file: /cvsroot/CMake/CMake/bootstrap,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- bootstrap	7 Feb 2008 21:14:05 -0000	1.108
+++ bootstrap	13 Feb 2008 19:47:03 -0000	1.109
@@ -49,6 +49,8 @@
 cmake_man_dir="/man"
 cmake_init_file=""
 cmake_bootstrap_system_libs=""
+cmake_bootstrap_qt_gui=""
+cmake_bootstrap_qt_qmake=""
 
 # Determine whether this is a MinGW environment.
 if echo "${cmake_system}" | grep MINGW >/dev/null 2>&1; then
@@ -172,6 +174,9 @@
   cmOrderRuntimeDirectories \
   cmComputeTargetDepends \
   cmComputeComponentGraph \
+  cmExprLexer \
+  cmExprParser \
+  cmExprParserHelper \
 "
 
 if ${cmake_system_mingw}; then
@@ -244,6 +249,9 @@
                           (for use only by package maintainers)
   --no-system-libs        use cmake-provided third-party libraries
                           (default)
+  --qt-gui                build the Qt-based GUI (requires Qt >= 4.2)
+  --no-qt-gui             do not build the Qt-based GUI (default)
+  --qt-qmake=<qmake>      use <qmake> as the qmake executable to find Qt
 
 Directory and file names:
   --prefix=PREFIX         install files in tree rooted at PREFIX
@@ -482,6 +490,15 @@
   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 "^--qt-gui" > /dev/null 2> /dev/null; then
+    cmake_bootstrap_qt_gui="1"
+  fi
+  if echo $a | grep "^--no-qt-gui" > /dev/null 2> /dev/null; then
+    cmake_bootstrap_qt_gui="0"
+  fi
+  if echo $a | grep "^--qt-qmake=" > /dev/null 2> /dev/null; then
+    cmake_bootstrap_qt_qmake=`echo $a | sed "s/^--qt-qmake=//"`
+  fi
   if echo $a | grep "^--help" > /dev/null 2> /dev/null; then
     cmake_usage
   fi
@@ -1302,6 +1319,18 @@
 SET (CMAKE_DATA_DIR "${cmake_data_dir}" CACHE PATH "Install location for data (relative to prefix)." FORCE)
 EOF
 
+# Add configuration settings given as command-line options.
+if [ "x${cmake_bootstrap_qt_gui}" != "x" ]; then
+  cat >> "${cmake_bootstrap_dir}/InitialCacheFlags.cmake" <<EOF
+SET (BUILD_QtDialog ${cmake_bootstrap_qt_gui} CACHE BOOL "Build Qt dialog for CMake" FORCE)
+EOF
+fi
+if [ "x${cmake_bootstrap_qt_qmake}" != "x" ]; then
+  cat >> "${cmake_bootstrap_dir}/InitialCacheFlags.cmake" <<EOF
+SET (QT_QMAKE_EXECUTABLE "${cmake_bootstrap_qt_qmake}" CACHE FILEPATH "Location of Qt qmake" FORCE)
+EOF
+fi
+
 # Add user-specified settings.  Handle relative-path case for
 # specification of cmake_init_file.
 (