diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rwxr-xr-x | bootstrap | 4 | ||||
| -rwxr-xr-x | configure | 10 | ||||
| -rw-r--r-- | configure.in | 12 |
4 files changed, 15 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9739809eca..cff8901892 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,9 +34,9 @@ ENABLE_TESTING() # Include the standard Dart testing module INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake) -INCLUDE (${CMake_BINARY_DIR}/Bootstrap/Source/InitialConfigureFlags.cmake +INCLUDE (${CMake_BINARY_DIR}/Bootstrap.cmk/Source/InitialConfigureFlags.cmake OPTIONAL) -INCLUDE (${CMake_BINARY_DIR}/Bootstrap/InitialConfigureFlags.cmake +INCLUDE (${CMake_BINARY_DIR}/Bootstrap.cmk/InitialConfigureFlags.cmake OPTIONAL) IF(CMAKE_CONFIGURE_INSTALL_PREFIX) @@ -30,7 +30,7 @@ CMAKE_SOURCES="\ cmake_source_dir=`echo $0 | sed -n '/\//{s/\/[^\/]*$//;p;}'` cmake_source_dir=`(cd "${cmake_source_dir}";pwd)` cmake_binary_dir=`pwd` -cmake_bootstrap_dir="${cmake_binary_dir}/Bootstrap" +cmake_bootstrap_dir="${cmake_binary_dir}/Bootstrap.cmk" cmake_usage() { @@ -316,7 +316,7 @@ for a in ${CMAKE_SOURCES}; do echo " ${cmake_cxx_compiler} ${cmake_cxx_flags} -c ${src} -o ${a}.o" >> "${cmake_bootstrap_dir}/Makefile" done -# Write prefix to Bootstrap/InitialConfigureFlags.cmake +# Write prefix to Bootstrap.cmk/InitialConfigureFlags.cmake echo "SET (CMAKE_CONFIGURE_INSTALL_PREFIX \"${cmake_prefix_dir}\" CACHE PATH \"Install path prefix, prepended onto install directories, For CMake this will always override CMAKE_INSTALL_PREFIX in the cache.\")" > "${cmake_bootstrap_dir}/InitialConfigureFlags.cmake" echo "---------------------------------------------" @@ -1681,23 +1681,23 @@ $RUNMAKE else PRGNAME=configure # Should be `basename $0` - DIRNAME=Bootstrap + DIRNAME=Bootstrap.cmk # Check if the bootstrap directory already exists. - if test -d Bootstrap; then + if test -d ${DIRNAME}; then : else # if it does not create one - mkdir Bootstrap + mkdir ${DIRNAME} fi if ( # Build bootstrap cmake - cd Bootstrap + cd ${DIRNAME} echo "Bootstrapping to directory `pwd`" BUILD_CMAKE_IN_SUBDIR=true $CMAKE_ROOT_DIR/$PRGNAME $ac_configure_args ); then # run cmake - Bootstrap/Source/cmake $fullSrcDir + ${DIRNAME}/Source/cmake $fullSrcDir # run cmake depends $RUNMAKE depend diff --git a/configure.in b/configure.in index e5eda4a6b9..fbd0dcc342 100644 --- a/configure.in +++ b/configure.in @@ -213,23 +213,23 @@ $RUNMAKE else PRGNAME=configure # Should be `basename $0` - DIRNAME=Bootstrap + DIRNAME=Bootstrap.cmk # Check if the bootstrap directory already exists. - if test -d Bootstrap; then + if test -d ${DIRNAME}; then : else # if it does not create one - mkdir Bootstrap + mkdir ${DIRNAME} fi if ( # Build bootstrap cmake - cd Bootstrap + cd ${DIRNAME} echo "Bootstrapping to directory `pwd`" BUILD_CMAKE_IN_SUBDIR=true $CMAKE_ROOT_DIR/$PRGNAME $ac_configure_args ); then # run cmake - Bootstrap/Source/cmake $fullSrcDir + ${DIRNAME}/Source/cmake $fullSrcDir # run cmake depends $RUNMAKE depend @@ -237,4 +237,4 @@ else echo "Problem bootstrapping CMake" exit 1 fi -fi
\ No newline at end of file +fi |