summaryrefslogtreecommitdiffstats
path: root/bootstrap
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-12-17 20:03:42 (GMT)
committerBrad King <brad.king@kitware.com>2015-12-18 15:02:07 (GMT)
commit036b6ef7c47ccb19f291d2f36df37aaf885b4ba8 (patch)
treed6072e0a2d63c5bcb2663d5b4582f521737bd93a /bootstrap
parent12293371ee0f3b930afee8d328415968eb8201e6 (diff)
downloadCMake-036b6ef7c47ccb19f291d2f36df37aaf885b4ba8.zip
CMake-036b6ef7c47ccb19f291d2f36df37aaf885b4ba8.tar.gz
CMake-036b6ef7c47ccb19f291d2f36df37aaf885b4ba8.tar.bz2
Port CMake from cmIML to KWIML
KWIML no longer uses a configured prefix.
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap19
1 files changed, 2 insertions, 17 deletions
diff --git a/bootstrap b/bootstrap
index b2421a1..860b5e4 100755
--- a/bootstrap
+++ b/bootstrap
@@ -373,11 +373,6 @@ KWSYS_FILES="\
SystemTools.hxx \
Terminal.h"
-KWIML_FILES='
- ABI.h
- INT.h
-'
-
# Display CMake bootstrap usage
cmake_usage()
{
@@ -702,11 +697,6 @@ if [ ! -d "cmsys" ]; then
cmake_error 4 "Cannot create directory ${cmake_bootstrap_dir}/cmsys"
fi
-[ -d "cmIML" ] || mkdir "cmIML"
-if [ ! -d "cmIML" ]; then
- cmake_error 12 "Cannot create directory ${cmake_bootstrap_dir}/cmIML"
-fi
-
# Delete all the bootstrap files
rm -f "${cmake_bootstrap_dir}/cmake_bootstrap.log"
rm -f "${cmake_bootstrap_dir}/cmConfigure.h${_tmp}"
@@ -1280,11 +1270,6 @@ for a in ${KWSYS_FILES}; do
"${cmake_bootstrap_dir}/cmsys/${a}" KWSYS_NAMESPACE cmsys
done
-for a in ${KWIML_FILES}; do
- cmake_replace_string "${cmake_source_dir}/Utilities/KWIML/${a}.in" \
- "${cmake_bootstrap_dir}/cmIML/${a}" KWIML cmIML
-done
-
# Generate Makefile
dep="cmConfigure.h cmsys/*.hxx cmsys/*.h `cmake_escape \"${cmake_source_dir}\"`/Source/*.h"
objs=""
@@ -1326,9 +1311,9 @@ cmake_cxx_flags_SystemTools="
-DKWSYS_CXX_HAS_UTIMES=${KWSYS_CXX_HAS_UTIMES}
"
cmake_c_flags="${cmake_c_flags}-I`cmake_escape \"${cmake_bootstrap_dir}\"` -I`cmake_escape \"${cmake_source_dir}/Source\"` \
- -I`cmake_escape \"${cmake_bootstrap_dir}\"`"
+ -I`cmake_escape \"${cmake_source_dir}/Utilities\"`"
cmake_cxx_flags="${cmake_cxx_flags} -I`cmake_escape \"${cmake_bootstrap_dir}\"` -I`cmake_escape \"${cmake_source_dir}/Source\"` \
- -I`cmake_escape \"${cmake_bootstrap_dir}\"`"
+ -I`cmake_escape \"${cmake_source_dir}/Utilities\"`"
echo "cmake: ${objs}" > "${cmake_bootstrap_dir}/Makefile"
echo " ${cmake_cxx_compiler} ${cmake_ld_flags} ${cmake_cxx_flags} ${objs} -o cmake" >> "${cmake_bootstrap_dir}/Makefile"
for a in ${CMAKE_CXX_SOURCES}; do