From 62ca4d34c24a94884924ccf261fd5906d9f99f93 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 10 Feb 2006 11:19:19 -0500 Subject: BUG: Fixed bootstrap from MSYS prompt. It was working only when the bootstrap directory in MSYS mapped to the same directory on windows except for the drive letter in front. Now it should work from any path. --- bootstrap | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/bootstrap b/bootstrap index 4d287a4..e76bbaa 100755 --- a/bootstrap +++ b/bootstrap @@ -1041,13 +1041,21 @@ else echo "${cmake_cxx_compiler} does not have ANSI for scoping" fi +# When bootstrapping on MinGW with MSYS we must convert the source +# directory to a windows path. +if ${cmake_system_mingw}; then + cmake_root_dir=`cd "${cmake_source_dir}"; pwd -W` +else + cmake_root_dir="${cmake_source_dir}" +fi + # Write CMake version for a in MAJOR MINOR PATCH; do CMake_VERSION=`cat "${cmake_source_dir}/CMakeLists.txt" | \ grep "SET(CMake_VERSION_${a} *[0-9]*)" | sed "s/SET(CMake_VERSION_${a} *\([0-9]*\))/\1/"` cmake_report cmConfigure.h.tmp "#define CMake_VERSION_${a} ${CMake_VERSION}" done -cmake_report cmConfigure.h.tmp "#define CMAKE_ROOT_DIR \"${cmake_source_dir}\"" +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" -- cgit v0.12