[Cmake-commits] [cmake-commits] king committed bootstrap 1.119 1.120

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Jun 10 13:04:27 EDT 2009


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

Modified Files:
	bootstrap 
Log Message:
ENH: Make bootstrap script work on VMS bash

A few sweeping changes were needed:

  - Avoid use of HEREDOC, which does not seem to work.
  - Avoid extra '.' in paths by using '_cmk' and '_tmp'
    instead of '.cmk' and '.tmp'.


Index: bootstrap
===================================================================
RCS file: /cvsroot/CMake/CMake/bootstrap,v
retrieving revision 1.119
retrieving revision 1.120
diff -C 2 -d -r1.119 -r1.120
*** bootstrap	10 Jun 2009 15:46:06 -0000	1.119
--- bootstrap	10 Jun 2009 17:04:25 -0000	1.120
***************
*** 38,42 ****
  cmake_source_dir=`(cd "${cmake_source_dir}";pwd)`
  cmake_binary_dir=`pwd`
- cmake_bootstrap_dir="${cmake_binary_dir}/Bootstrap.cmk"
  cmake_version_major="`cmake_version_component MAJOR`"
  cmake_version_minor="`cmake_version_component MINOR`"
--- 38,41 ----
***************
*** 91,94 ****
--- 90,100 ----
  fi
  
+ # Determine whether this is OpenVMS
+ if echo "${cmake_system}" | grep OpenVMS >/dev/null 2>&1; then
+   cmake_system_openvms=true
+ else
+   cmake_system_openvms=false
+ fi
+ 
  # Choose the generator to use for bootstrapping.
  if ${cmake_system_mingw}; then
***************
*** 100,103 ****
--- 106,123 ----
  fi
  
+ # Choose tools and extensions for this platform.
+ if ${cmake_system_openvms}; then
+   _tmp="_tmp"
+   _cmk="_cmk"
+   _diff=`which diff`
+ else
+   _tmp=".tmp"
+   _cmk=".cmk"
+   _diff="diff"
+ fi
+ 
+ # Construct bootstrap directory name.
+ cmake_bootstrap_dir="${cmake_binary_dir}/Bootstrap${_cmk}"
+ 
  # Helper function to fix windows paths.
  cmake_fix_slashes ()
***************
*** 262,267 ****
  cmake_usage()
  {
!   cat <<EOF
! Usage: $0 [options]
  Options: [defaults in brackets after descriptions]
  Configuration:
--- 282,287 ----
  cmake_usage()
  {
! echo '
! Usage: '"$0"' [options]
  Options: [defaults in brackets after descriptions]
  Configuration:
***************
*** 289,293 ****
    --mandir=DIR            install man pages files in PREFIX/DIR/manN
                            [/man]
! EOF
    exit 10
  }
--- 309,313 ----
    --mandir=DIR            install man pages files in PREFIX/DIR/manN
                            [/man]
! '
    exit 10
  }
***************
*** 323,335 ****
    SEARCHFOR="$3"
    REPLACEWITH="$4"
!   if [ -f "${INFILE}" ]; then
      cat "${INFILE}" | 
!       sed "s/\@${SEARCHFOR}\@/${REPLACEWITH}/g" > "${OUTFILE}.tmp"
!     if [ -f "${OUTFILE}.tmp" ]; then
!       if diff "${OUTFILE}" "${OUTFILE}.tmp" > /dev/null 2> /dev/null ; then
          #echo "Files are the same"
!         rm -f "${OUTFILE}.tmp"
        else
!         mv -f "${OUTFILE}.tmp" "${OUTFILE}"
        fi
      fi
--- 343,355 ----
    SEARCHFOR="$3"
    REPLACEWITH="$4"
!   if [ -f "${INFILE}" ] || ${cmake_system_openvms}; then
      cat "${INFILE}" | 
!       sed "s/\@${SEARCHFOR}\@/${REPLACEWITH}/g" > "${OUTFILE}${_tmp}"
!     if [ -f "${OUTFILE}${_tmp}" ]; then
!       if "${_diff}" "${OUTFILE}" "${OUTFILE}${_tmp}" > /dev/null 2> /dev/null ; then
          #echo "Files are the same"
!         rm -f "${OUTFILE}${_tmp}"
        else
!         mv -f "${OUTFILE}${_tmp}" "${OUTFILE}"
        fi
      fi
***************
*** 345,350 ****
    shift 2
    APPEND="$*"
!   if [ -f "${INFILE}" ]; then
!     echo "${APPEND}" > "${OUTFILE}.tmp"
      cat "${INFILE}" | 
        sed "/./ {s/\@KWSYS_NAMESPACE\@/cmsys/g;
--- 365,370 ----
    shift 2
    APPEND="$*"
!   if [ -f "${INFILE}" ] || ${cmake_system_openvms}; then
!     echo "${APPEND}" > "${OUTFILE}${_tmp}"
      cat "${INFILE}" | 
        sed "/./ {s/\@KWSYS_NAMESPACE\@/cmsys/g;
***************
*** 375,385 ****
                  s/@KWSYS_CXX_HAS_FULL_SPECIALIZATION@/${KWSYS_CXX_HAS_FULL_SPECIALIZATION}/g;
                  s/@KWSYS_CXX_HAS_ARGUMENT_DEPENDENT_LOOKUP@/${KWSYS_CXX_HAS_ARGUMENT_DEPENDENT_LOOKUP}/g;
!                 s/@KWSYS_STAT_HAS_ST_MTIM@/${KWSYS_STAT_HAS_ST_MTIM}/g;}" >> "${OUTFILE}.tmp"
!     if [ -f "${OUTFILE}.tmp" ]; then
!       if diff "${OUTFILE}" "${OUTFILE}.tmp" > /dev/null 2> /dev/null ; then
          #echo "Files are the same"
!         rm -f "${OUTFILE}.tmp"
        else
!         mv -f "${OUTFILE}.tmp" "${OUTFILE}"
        fi
      fi
--- 395,405 ----
                  s/@KWSYS_CXX_HAS_FULL_SPECIALIZATION@/${KWSYS_CXX_HAS_FULL_SPECIALIZATION}/g;
                  s/@KWSYS_CXX_HAS_ARGUMENT_DEPENDENT_LOOKUP@/${KWSYS_CXX_HAS_ARGUMENT_DEPENDENT_LOOKUP}/g;
!                 s/@KWSYS_STAT_HAS_ST_MTIM@/${KWSYS_STAT_HAS_ST_MTIM}/g;}" >> "${OUTFILE}${_tmp}"
!     if [ -f "${OUTFILE}${_tmp}" ]; then
!       if "${_diff}" "${OUTFILE}" "${OUTFILE}${_tmp}" > /dev/null 2> /dev/null ; then
          #echo "Files are the same"
!         rm -f "${OUTFILE}${_tmp}"
        else
!         mv -f "${OUTFILE}${_tmp}" "${OUTFILE}"
        fi
      fi
***************
*** 411,415 ****
  cmake_tmp_file ()
  {
!   echo "cmake_bootstrap_$$.test"
  }
  
--- 431,435 ----
  cmake_tmp_file ()
  {
!   echo "cmake_bootstrap_$$_test"
  }
  
***************
*** 560,567 ****
  if [ -z "${cmake_in_source_build}" ]; then
    # Did somebody bootstrap in the source tree?
!   if [ -d "${cmake_source_dir}/Bootstrap.cmk" ]; then
!     cmake_error 10 "Found directory \"${cmake_source_dir}/Bootstrap.cmk\".
  Looks like somebody did bootstrap CMake in the source tree, but now you are
! trying to do bootstrap in the binary tree. Please remove Bootstrap.cmk
  directory from the source tree."
    fi
--- 580,587 ----
  if [ -z "${cmake_in_source_build}" ]; then
    # Did somebody bootstrap in the source tree?
!   if [ -d "${cmake_source_dir}/Bootstrap${_cmk}" ]; then
!     cmake_error 10 "Found directory \"${cmake_source_dir}/Bootstrap${_cmk}\".
  Looks like somebody did bootstrap CMake in the source tree, but now you are
! trying to do bootstrap in the binary tree. Please remove Bootstrap${_cmk}
  directory from the source tree."
    fi
***************
*** 598,603 ****
  # Delete all the bootstrap files
  rm -f "${cmake_bootstrap_dir}/cmake_bootstrap.log"
! rm -f "${cmake_bootstrap_dir}/cmConfigure.h.tmp"
! rm -f "${cmake_bootstrap_dir}/cmVersionConfig.h.tmp"
  
  # If exist compiler flags, set them
--- 618,623 ----
  # Delete all the bootstrap files
  rm -f "${cmake_bootstrap_dir}/cmake_bootstrap.log"
! rm -f "${cmake_bootstrap_dir}/cmConfigure.h${_tmp}"
! rm -f "${cmake_bootstrap_dir}/cmVersionConfig.h${_tmp}"
  
  # If exist compiler flags, set them
***************
*** 638,642 ****
  # Check if C compiler works
  TMPFILE=`cmake_tmp_file`
! cat > "${TMPFILE}.c" <<EOF
  #ifdef __cplusplus
  # error "The CMAKE_C_COMPILER is set to a C++ compiler"
--- 658,662 ----
  # Check if C compiler works
  TMPFILE=`cmake_tmp_file`
! echo '
  #ifdef __cplusplus
  # error "The CMAKE_C_COMPILER is set to a C++ compiler"
***************
*** 656,660 ****
    return argc-1;
  }
! EOF
  for a in ${cmake_c_compilers}; do
    if [ -z "${cmake_c_compiler}" ] && \
--- 676,680 ----
    return argc-1;
  }
! ' > "${TMPFILE}.c"
  for a in ${cmake_c_compilers}; do
    if [ -z "${cmake_c_compiler}" ] && \
***************
*** 687,691 ****
  # Check if C++ compiler works
  TMPFILE=`cmake_tmp_file`
! cat > "${TMPFILE}.cxx" <<EOF
  #if defined(TEST1)
  # include <iostream>
--- 707,711 ----
  # Check if C++ compiler works
  TMPFILE=`cmake_tmp_file`
! echo '
  #if defined(TEST1)
  # include <iostream>
***************
*** 712,716 ****
    return 0;
  }
! EOF
  for a in ${cmake_cxx_compilers}; do
    for b in 1 2 3; do
--- 732,736 ----
    return 0;
  }
! ' > "${TMPFILE}.cxx"
  for a in ${cmake_cxx_compilers}; do
    for b in 1 2 3; do
***************
*** 746,757 ****
  mkdir "${cmake_bootstrap_dir}/${TMPFILE}"
  cd "${cmake_bootstrap_dir}/${TMPFILE}"
! cat>"Makefile"<<EOF
  test: test.c
! 	"${cmake_c_compiler}" -o test test.c
! EOF
! cat>"test.c"<<EOF
  #include <stdio.h>
  int main(){ printf("1\n"); return 0; }
! EOF
  cmake_original_make_flags="${cmake_make_flags}"
  if [ "x${cmake_parallel_make}" != "x" ]; then
--- 766,777 ----
  mkdir "${cmake_bootstrap_dir}/${TMPFILE}"
  cd "${cmake_bootstrap_dir}/${TMPFILE}"
! echo '
  test: test.c
! 	"'"${cmake_c_compiler}"'" -o test test.c
! '>"Makefile"
! echo '
  #include <stdio.h>
  int main(){ printf("1\n"); return 0; }
! ' > "test.c"
  cmake_original_make_flags="${cmake_make_flags}"
  if [ "x${cmake_parallel_make}" != "x" ]; then
***************
*** 795,804 ****
  
  TMPFILE=`cmake_tmp_file`
! cat > ${TMPFILE}.cxx <<EOF
  #if defined(__GNUC__) && !defined(__INTEL_COMPILER)
  #include <iostream>
  int main() { std::cout << "This is GNU" << std::endl; return 0;}
  #endif
! EOF
  cmake_cxx_compiler_is_gnu=0
  if cmake_try_run "${cmake_cxx_compiler}" \
--- 815,824 ----
  
  TMPFILE=`cmake_tmp_file`
! echo '
  #if defined(__GNUC__) && !defined(__INTEL_COMPILER)
  #include <iostream>
  int main() { std::cout << "This is GNU" << std::endl; return 0;}
  #endif
! ' > ${TMPFILE}.cxx
  cmake_cxx_compiler_is_gnu=0
  if cmake_try_run "${cmake_cxx_compiler}" \
***************
*** 820,827 ****
    if [ "x${cmake_system}" = "xIRIX64" ]; then
      TMPFILE=`cmake_tmp_file`
!     cat > ${TMPFILE}.cxx <<EOF
      #include <iostream>
!     int main() { std::cout << "No need for ${cmake_test_flags}" << std::endl; return 0;}
! EOF
      cmake_need_lang_std=0
      if cmake_try_run "${cmake_cxx_compiler}" \
--- 840,847 ----
    if [ "x${cmake_system}" = "xIRIX64" ]; then
      TMPFILE=`cmake_tmp_file`
!     echo '
      #include <iostream>
!     int main() { std::cout << "No need for '"${cmake_test_flags}"'" << std::endl; return 0;}
! ' > ${TMPFILE}.cxx
      cmake_need_lang_std=0
      if cmake_try_run "${cmake_cxx_compiler}" \
***************
*** 848,855 ****
    if [ "x${cmake_system}" = "xOSF1" ]; then
      TMPFILE=`cmake_tmp_file`
!     cat > ${TMPFILE}.cxx <<EOF
      #include <iostream>
!     int main() { std::cout << "We need ${cmake_test_flags}" << std::endl; return 0;}
! EOF
      cmake_need_flags=1
      if cmake_try_run "${cmake_cxx_compiler}" \
--- 868,875 ----
    if [ "x${cmake_system}" = "xOSF1" ]; then
      TMPFILE=`cmake_tmp_file`
!     echo '
      #include <iostream>
!     int main() { std::cout << "We need '"${cmake_test_flags}"'" << std::endl; return 0;}
! ' > ${TMPFILE}.cxx
      cmake_need_flags=1
      if cmake_try_run "${cmake_cxx_compiler}" \
***************
*** 873,880 ****
    if [ "x${cmake_system}" = "xOSF1" ]; then
      TMPFILE=`cmake_tmp_file`
!     cat > ${TMPFILE}.cxx <<EOF
      #include <iostream>
!     int main() { std::cout << "We need ${cmake_test_flags}" << std::endl; return 0;}
! EOF
      cmake_need_flags=1
      if cmake_try_run "${cmake_cxx_compiler}" \
--- 893,900 ----
    if [ "x${cmake_system}" = "xOSF1" ]; then
      TMPFILE=`cmake_tmp_file`
!     echo '
      #include <iostream>
!     int main() { std::cout << "We need '"${cmake_test_flags}"'" << std::endl; return 0;}
! ' > ${TMPFILE}.cxx
      cmake_need_flags=1
      if cmake_try_run "${cmake_cxx_compiler}" \
***************
*** 898,904 ****
    if [ "x${cmake_system}" = "xHP-UX" ]; then
      TMPFILE=`cmake_tmp_file`
!     cat > ${TMPFILE}.c <<EOF
      int main(int argc, char** argv) { (void)argc; (void)argv; return 0; }
! EOF
      cmake_need_Ae=0
      if cmake_try_run "${cmake_c_compiler}" "${cmake_c_flags}" "${TMPFILE}.c" >> cmake_bootstrap.log 2>&1; then
--- 918,924 ----
    if [ "x${cmake_system}" = "xHP-UX" ]; then
      TMPFILE=`cmake_tmp_file`
!     echo '
      int main(int argc, char** argv) { (void)argc; (void)argv; return 0; }
! ' > ${TMPFILE}.c
      cmake_need_Ae=0
      if cmake_try_run "${cmake_c_compiler}" "${cmake_c_flags}" "${TMPFILE}.c" >> cmake_bootstrap.log 2>&1; then
***************
*** 1175,1196 ****
  "
  
! cmake_report cmConfigure.h.tmp "${cmake_compiler_settings_comment}"
  
  if [ "x$KWSYS_STL_HAVE_STD" = "x1" ]; then
!   cmake_report cmConfigure.h.tmp "/* #undef CMAKE_NO_STD_NAMESPACE */"
  else
!   cmake_report cmConfigure.h.tmp "#define CMAKE_NO_STD_NAMESPACE 1"
  fi
  
  if [ "x$KWSYS_IOS_USE_ANSI" = "x1" ]; then
!   cmake_report cmConfigure.h.tmp "/* #undef CMAKE_NO_ANSI_STREAM_HEADERS */"
  else
!   cmake_report cmConfigure.h.tmp "#define CMAKE_NO_ANSI_STREAM_HEADERS 1"
  fi
  
  if [ "x$KWSYS_IOS_USE_SSTREAM" = "x1" ]; then
!   cmake_report cmConfigure.h.tmp "/* #undef CMAKE_NO_ANSI_STRING_STREAM */"
  else
!   cmake_report cmConfigure.h.tmp "#define CMAKE_NO_ANSI_STRING_STREAM 1"
  fi
  
--- 1195,1216 ----
  "
  
! cmake_report cmConfigure.h${_tmp} "${cmake_compiler_settings_comment}"
  
  if [ "x$KWSYS_STL_HAVE_STD" = "x1" ]; then
!   cmake_report cmConfigure.h${_tmp} "/* #undef CMAKE_NO_STD_NAMESPACE */"
  else
!   cmake_report cmConfigure.h${_tmp} "#define CMAKE_NO_STD_NAMESPACE 1"
  fi
  
  if [ "x$KWSYS_IOS_USE_ANSI" = "x1" ]; then
!   cmake_report cmConfigure.h${_tmp} "/* #undef CMAKE_NO_ANSI_STREAM_HEADERS */"
  else
!   cmake_report cmConfigure.h${_tmp} "#define CMAKE_NO_ANSI_STREAM_HEADERS 1"
  fi
  
  if [ "x$KWSYS_IOS_USE_SSTREAM" = "x1" ]; then
!   cmake_report cmConfigure.h${_tmp} "/* #undef CMAKE_NO_ANSI_STRING_STREAM */"
  else
!   cmake_report cmConfigure.h${_tmp} "#define CMAKE_NO_ANSI_STRING_STREAM 1"
  fi
  
***************
*** 1199,1206 ****
    "${cmake_cxx_flags}" \
    "${cmake_source_dir}/Modules/TestForAnsiForScope.cxx" >> cmake_bootstrap.log 2>&1; then
!   cmake_report cmConfigure.h.tmp "/* #undef CMAKE_NO_ANSI_FOR_SCOPE */"
    echo "${cmake_cxx_compiler} has ANSI for scoping"
  else
!   cmake_report cmConfigure.h.tmp "#define CMAKE_NO_ANSI_FOR_SCOPE 1"
    echo "${cmake_cxx_compiler} does not have ANSI for scoping"
  fi
--- 1219,1226 ----
    "${cmake_cxx_flags}" \
    "${cmake_source_dir}/Modules/TestForAnsiForScope.cxx" >> cmake_bootstrap.log 2>&1; then
!   cmake_report cmConfigure.h${_tmp} "/* #undef CMAKE_NO_ANSI_FOR_SCOPE */"
    echo "${cmake_cxx_compiler} has ANSI for scoping"
  else
!   cmake_report cmConfigure.h${_tmp} "#define CMAKE_NO_ANSI_FOR_SCOPE 1"
    echo "${cmake_cxx_compiler} does not have ANSI for scoping"
  fi
***************
*** 1215,1231 ****
  
  # Write CMake version
! cmake_report cmVersionConfig.h.tmp "#define CMake_VERSION_MAJOR ${cmake_version_major}"
! cmake_report cmVersionConfig.h.tmp "#define CMake_VERSION_MINOR ${cmake_version_minor}"
! cmake_report cmVersionConfig.h.tmp "#define CMake_VERSION_PATCH ${cmake_version_patch}"
! cmake_report cmConfigure.h.tmp "#define CMAKE_ROOT_DIR \"${cmake_root_dir}\""
! cmake_report cmConfigure.h.tmp "#define CMAKE_DATA_DIR \"${cmake_data_dir}\""
! cmake_report cmConfigure.h.tmp "#define CMAKE_BOOTSTRAP"
  
  # Regenerate configured headers
  for h in Configure VersionConfig; do
!   if diff cm${h}.h cm${h}.h.tmp > /dev/null 2> /dev/null; then
!     rm -f cm${h}.h.tmp
    else
!     mv -f cm${h}.h.tmp cm${h}.h
    fi
  done
--- 1235,1251 ----
  
  # Write CMake version
! cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION_MAJOR ${cmake_version_major}"
! cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION_MINOR ${cmake_version_minor}"
! cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION_PATCH ${cmake_version_patch}"
! cmake_report cmConfigure.h${_tmp} "#define CMAKE_ROOT_DIR \"${cmake_root_dir}\""
! cmake_report cmConfigure.h${_tmp} "#define CMAKE_DATA_DIR \"${cmake_data_dir}\""
! cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP"
  
  # Regenerate configured headers
  for h in Configure VersionConfig; do
!   if "${_diff}" cm${h}.h cm${h}.h${_tmp} > /dev/null 2> /dev/null; then
!     rm -f cm${h}.h${_tmp}
    else
!     mv -f cm${h}.h${_tmp} cm${h}.h
    fi
  done
***************
*** 1252,1262 ****
  
  cmake_replace_string "${cmake_source_dir}/Source/kwsys/kwsys_stl.hxx.in" \
!    "${cmake_bootstrap_dir}/cmsys/stl/stl.hxx.in" KWSYS_STL_HEADER_EXTRA ""
  
! cmake_replace_string "${cmake_bootstrap_dir}/cmsys/stl/stl.hxx.in" \
!    "${cmake_bootstrap_dir}/cmsys/stl/stl.h.in" KWSYS_NAMESPACE cmsys
  
  for a in string vector map algorithm; do
!   cmake_replace_string "${cmake_bootstrap_dir}/cmsys/stl/stl.h.in" \
      "${cmake_bootstrap_dir}/cmsys/stl/${a}" KWSYS_STL_HEADER ${a}
  done
--- 1272,1282 ----
  
  cmake_replace_string "${cmake_source_dir}/Source/kwsys/kwsys_stl.hxx.in" \
!    "${cmake_bootstrap_dir}/cmsys/stl/stl.hxx_a" KWSYS_STL_HEADER_EXTRA ""
  
! cmake_replace_string "${cmake_bootstrap_dir}/cmsys/stl/stl.hxx_a" \
!    "${cmake_bootstrap_dir}/cmsys/stl/stl.hxx_b" KWSYS_NAMESPACE cmsys
  
  for a in string vector map algorithm; do
!   cmake_replace_string "${cmake_bootstrap_dir}/cmsys/stl/stl.hxx_b" \
      "${cmake_bootstrap_dir}/cmsys/stl/${a}" KWSYS_STL_HEADER ${a}
  done
***************
*** 1330,1358 ****
    echo "	${cmake_c_compiler} ${cmake_c_flags} -I`cmake_escape \"${cmake_source_dir}/Source/kwsys\"` -DKWSYS_NAMESPACE=cmsys -c ${src} -o ${a}.o" >> "${cmake_bootstrap_dir}/Makefile"
  fi
! cat>>"${cmake_bootstrap_dir}/Makefile"<<EOF
  rebuild_cache:
  	cd "${cmake_binary_dir}" && "${cmake_source_dir}/bootstrap"
! EOF
  
! # Write our default settings to Bootstrap.cmk/InitialCacheFlags.cmake.
! cat > "${cmake_bootstrap_dir}/InitialCacheFlags.cmake" <<EOF
! # Generated by ${cmake_source_dir}/bootstrap
  # Default cmake settings.  These may be overridden any settings below.
! SET (CMAKE_INSTALL_PREFIX "${cmake_prefix_dir}" CACHE PATH "Install path prefix, prepended onto install directories." FORCE)
! SET (CMAKE_DOC_DIR "${cmake_doc_dir}" CACHE PATH "Install location for documentation (relative to prefix)." FORCE)
! SET (CMAKE_MAN_DIR "${cmake_man_dir}" CACHE PATH "Install location for man pages (relative to prefix)." FORCE)
! 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
  
--- 1350,1378 ----
    echo "	${cmake_c_compiler} ${cmake_c_flags} -I`cmake_escape \"${cmake_source_dir}/Source/kwsys\"` -DKWSYS_NAMESPACE=cmsys -c ${src} -o ${a}.o" >> "${cmake_bootstrap_dir}/Makefile"
  fi
! echo '
  rebuild_cache:
  	cd "${cmake_binary_dir}" && "${cmake_source_dir}/bootstrap"
! ' >> "${cmake_bootstrap_dir}/Makefile"
  
! # Write our default settings to Bootstrap${_cmk}/InitialCacheFlags.cmake.
! echo '
! # Generated by '"${cmake_source_dir}"'/bootstrap
  # Default cmake settings.  These may be overridden any settings below.
! SET (CMAKE_INSTALL_PREFIX "'"${cmake_prefix_dir}"'" CACHE PATH "Install path prefix, prepended onto install directories." FORCE)
! SET (CMAKE_DOC_DIR "'"${cmake_doc_dir}"'" CACHE PATH "Install location for documentation (relative to prefix)." FORCE)
! SET (CMAKE_MAN_DIR "'"${cmake_man_dir}"'" CACHE PATH "Install location for man pages (relative to prefix)." FORCE)
! SET (CMAKE_DATA_DIR "'"${cmake_data_dir}"'" CACHE PATH "Install location for data (relative to prefix)." FORCE)
! ' > "${cmake_bootstrap_dir}/InitialCacheFlags.cmake"
  
  # Add configuration settings given as command-line options.
  if [ "x${cmake_bootstrap_qt_gui}" != "x" ]; then
!   echo '
! SET (BUILD_QtDialog '"${cmake_bootstrap_qt_gui}"' CACHE BOOL "Build Qt dialog for CMake" FORCE)
! ' >> "${cmake_bootstrap_dir}/InitialCacheFlags.cmake"
  fi
  if [ "x${cmake_bootstrap_qt_qmake}" != "x" ]; then
!   echo '
! SET (QT_QMAKE_EXECUTABLE "'"${cmake_bootstrap_qt_qmake}"'" CACHE FILEPATH "Location of Qt qmake" FORCE)
! ' >> "${cmake_bootstrap_dir}/InitialCacheFlags.cmake"
  fi
  



More information about the Cmake-commits mailing list