summaryrefslogtreecommitdiffstats
path: root/bootstrap
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2012-12-19 14:00:55 (GMT)
committerBrad King <brad.king@kitware.com>2012-12-19 14:07:41 (GMT)
commit2c24ca92193f0a03fbf8c0bb13f6a1cca83dd08e (patch)
tree0a0d5e28b4b771e7986ccdf78bd9f2bfb60bb405 /bootstrap
parente33fa5b67880e47fb350d5545a5ba04b8d6f3eb3 (diff)
downloadCMake-2c24ca92193f0a03fbf8c0bb13f6a1cca83dd08e.zip
CMake-2c24ca92193f0a03fbf8c0bb13f6a1cca83dd08e.tar.gz
CMake-2c24ca92193f0a03fbf8c0bb13f6a1cca83dd08e.tar.bz2
Remove references to KWSys Process Win9x support
The KWSys "EncodeExecutable" and "ProcessFwd9x" executables were dropped from KWSys along with Win9x Process support. Drop references from the rest of the CMake build rules.
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap27
1 files changed, 3 insertions, 24 deletions
diff --git a/bootstrap b/bootstrap
index 0e6d16c..643720c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -284,18 +284,11 @@ if ${cmake_system_mingw}; then
ProcessWin32 \
String \
System"
- KWSYS_C_MINGW_SOURCES="\
- ProcessFwd9x \
- EncodeExecutable"
- KWSYS_C_GENERATED_SOURCES="\
- cmsysProcessFwd9xEnc"
else
KWSYS_C_SOURCES="\
ProcessUNIX \
String \
System"
- KWSYS_C_MINGW_SOURCES=""
- KWSYS_C_GENERATED_SOURCES=""
fi
KWSYS_CXX_SOURCES="\
@@ -1351,7 +1344,7 @@ cmake_compiler_settings_comment="/*
* Sources:
* ${CMAKE_CXX_SOURCES} ${CMAKE_C_SOURCES}
* kwSys Sources:
- * ${KWSYS_CXX_SOURCES} ${KWSYS_C_SOURCES} ${KWSYS_C_MINGW_SOURCES}
+ * ${KWSYS_CXX_SOURCES} ${KWSYS_C_SOURCES}
*/
"
@@ -1447,7 +1440,7 @@ done
# Generate Makefile
dep="cmConfigure.h cmsys/*.hxx cmsys/*.h `cmake_escape \"${cmake_source_dir}\"`/Source/*.h"
objs=""
-for a in ${CMAKE_CXX_SOURCES} ${CMAKE_C_SOURCES} ${KWSYS_CXX_SOURCES} ${KWSYS_C_SOURCES} ${KWSYS_C_GENERATED_SOURCES}; do
+for a in ${CMAKE_CXX_SOURCES} ${CMAKE_C_SOURCES} ${KWSYS_CXX_SOURCES} ${KWSYS_C_SOURCES}; do
objs="${objs} ${a}.o"
done
@@ -1488,7 +1481,7 @@ for a in ${CMAKE_C_SOURCES}; do
echo "${a}.o : ${src} ${dep}" >> "${cmake_bootstrap_dir}/Makefile"
echo " ${cmake_c_compiler} ${cmake_c_flags} -c ${src} -o ${a}.o" >> "${cmake_bootstrap_dir}/Makefile"
done
-for a in ${KWSYS_C_SOURCES} ${KWSYS_C_MINGW_SOURCES}; do
+for a in ${KWSYS_C_SOURCES}; do
src=`cmake_escape "${cmake_source_dir}/Source/kwsys/${a}.c"`
src_flags=`eval echo \\${cmake_c_flags_\${a}}`
echo "${a}.o : ${src} ${dep}" >> "${cmake_bootstrap_dir}/Makefile"
@@ -1500,20 +1493,6 @@ for a in ${KWSYS_CXX_SOURCES}; do
echo "${a}.o : ${src} ${dep}" >> "${cmake_bootstrap_dir}/Makefile"
echo " ${cmake_cxx_compiler} ${cmake_cxx_flags} -DKWSYS_NAMESPACE=cmsys ${src_flags} -c ${src} -o ${a}.o" >> "${cmake_bootstrap_dir}/Makefile"
done
-if ${cmake_system_mingw}; then
- src=`cmake_escape "${cmake_bootstrap_dir}/cmsysProcessFwd9xEnc.c"`
- in=`cmake_escape "${cmake_bootstrap_dir}/cmsysProcessFwd9x.exe"`
- cmd=`cmake_escape "${cmake_bootstrap_dir}/cmsysEncodeExecutable.exe"`
- a="cmsysProcessFwd9xEnc"
- echo "${cmd} : EncodeExecutable.o" >> "${cmake_bootstrap_dir}/Makefile"
- echo " ${cmake_c_compiler} ${cmake_ld_flags} ${cmake_c_flags} EncodeExecutable.o -o ${cmd}" >> "${cmake_bootstrap_dir}/Makefile"
- echo "${in} : ProcessFwd9x.o" >> "${cmake_bootstrap_dir}/Makefile"
- echo " ${cmake_c_compiler} ${cmake_ld_flags} ${cmake_c_flags} ProcessFwd9x.o -o ${in}" >> "${cmake_bootstrap_dir}/Makefile"
- echo "${src} : ${cmd} ${in}" >> "${cmake_bootstrap_dir}/Makefile"
- echo " ${cmd} ${in} ${src} cmsys ProcessFwd9x" >> "${cmake_bootstrap_dir}/Makefile"
- echo "${a}.o : ${src} ${dep}" >> "${cmake_bootstrap_dir}/Makefile"
- 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"