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.
This commit is contained in:
parent
e33fa5b678
commit
2c24ca9219
|
@ -234,8 +234,6 @@ macro (CMAKE_BUILD_UTILITIES)
|
||||||
set(kwsys_folder "Utilities/KWSys")
|
set(kwsys_folder "Utilities/KWSys")
|
||||||
CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE} "${kwsys_folder}")
|
CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE} "${kwsys_folder}")
|
||||||
CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}_c "${kwsys_folder}")
|
CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}_c "${kwsys_folder}")
|
||||||
CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}EncodeExecutable "${kwsys_folder}")
|
|
||||||
CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}ProcessFwd9x "${kwsys_folder}")
|
|
||||||
if(BUILD_TESTING)
|
if(BUILD_TESTING)
|
||||||
CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}TestDynload "${kwsys_folder}")
|
CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}TestDynload "${kwsys_folder}")
|
||||||
CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}TestProcess "${kwsys_folder}")
|
CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}TestProcess "${kwsys_folder}")
|
||||||
|
|
27
bootstrap
27
bootstrap
|
@ -284,18 +284,11 @@ if ${cmake_system_mingw}; then
|
||||||
ProcessWin32 \
|
ProcessWin32 \
|
||||||
String \
|
String \
|
||||||
System"
|
System"
|
||||||
KWSYS_C_MINGW_SOURCES="\
|
|
||||||
ProcessFwd9x \
|
|
||||||
EncodeExecutable"
|
|
||||||
KWSYS_C_GENERATED_SOURCES="\
|
|
||||||
cmsysProcessFwd9xEnc"
|
|
||||||
else
|
else
|
||||||
KWSYS_C_SOURCES="\
|
KWSYS_C_SOURCES="\
|
||||||
ProcessUNIX \
|
ProcessUNIX \
|
||||||
String \
|
String \
|
||||||
System"
|
System"
|
||||||
KWSYS_C_MINGW_SOURCES=""
|
|
||||||
KWSYS_C_GENERATED_SOURCES=""
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
KWSYS_CXX_SOURCES="\
|
KWSYS_CXX_SOURCES="\
|
||||||
|
@ -1351,7 +1344,7 @@ cmake_compiler_settings_comment="/*
|
||||||
* Sources:
|
* Sources:
|
||||||
* ${CMAKE_CXX_SOURCES} ${CMAKE_C_SOURCES}
|
* ${CMAKE_CXX_SOURCES} ${CMAKE_C_SOURCES}
|
||||||
* kwSys 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
|
# Generate Makefile
|
||||||
dep="cmConfigure.h cmsys/*.hxx cmsys/*.h `cmake_escape \"${cmake_source_dir}\"`/Source/*.h"
|
dep="cmConfigure.h cmsys/*.hxx cmsys/*.h `cmake_escape \"${cmake_source_dir}\"`/Source/*.h"
|
||||||
objs=""
|
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"
|
objs="${objs} ${a}.o"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
@ -1488,7 +1481,7 @@ for a in ${CMAKE_C_SOURCES}; do
|
||||||
echo "${a}.o : ${src} ${dep}" >> "${cmake_bootstrap_dir}/Makefile"
|
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"
|
echo " ${cmake_c_compiler} ${cmake_c_flags} -c ${src} -o ${a}.o" >> "${cmake_bootstrap_dir}/Makefile"
|
||||||
done
|
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=`cmake_escape "${cmake_source_dir}/Source/kwsys/${a}.c"`
|
||||||
src_flags=`eval echo \\${cmake_c_flags_\${a}}`
|
src_flags=`eval echo \\${cmake_c_flags_\${a}}`
|
||||||
echo "${a}.o : ${src} ${dep}" >> "${cmake_bootstrap_dir}/Makefile"
|
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 "${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"
|
echo " ${cmake_cxx_compiler} ${cmake_cxx_flags} -DKWSYS_NAMESPACE=cmsys ${src_flags} -c ${src} -o ${a}.o" >> "${cmake_bootstrap_dir}/Makefile"
|
||||||
done
|
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 '
|
echo '
|
||||||
rebuild_cache:
|
rebuild_cache:
|
||||||
cd "${cmake_binary_dir}" && "${cmake_source_dir}/bootstrap"
|
cd "${cmake_binary_dir}" && "${cmake_source_dir}/bootstrap"
|
||||||
|
|
Loading…
Reference in New Issue