This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via d46a8dbe42ed74d3409ffabf2a0a5d094d5a2b28 (commit)
via 2c24ca92193f0a03fbf8c0bb13f6a1cca83dd08e (commit)
from 553fb874dc5ddf5e2541a6bf3eb133f5deaea1d0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d46a8dbe42ed74d3409ffabf2a0a5d094d5a2b28
commit d46a8dbe42ed74d3409ffabf2a0a5d094d5a2b28
Merge: 553fb87 2c24ca9
Author: Brad King <[email protected]>
AuthorDate: Wed Dec 19 09:10:13 2012 -0500
Commit: CMake Topic Stage <[email protected]>
CommitDate: Wed Dec 19 09:10:13 2012 -0500
Merge topic 'update-kwsys' into next
2c24ca9 Remove references to KWSys Process Win9x support
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2c24ca92193f0a03fbf8c0bb13f6a1cca83dd08e
commit 2c24ca92193f0a03fbf8c0bb13f6a1cca83dd08e
Author: Brad King <[email protected]>
AuthorDate: Wed Dec 19 09:00:55 2012 -0500
Commit: Brad King <[email protected]>
CommitDate: Wed Dec 19 09:07:41 2012 -0500
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.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a67fb6e..9ad9587 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -234,8 +234,6 @@ macro (CMAKE_BUILD_UTILITIES)
set(kwsys_folder "Utilities/KWSys")
CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE} "${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)
CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}TestDynload "${kwsys_folder}")
CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}TestProcess "${kwsys_folder}")
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"
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 2 --
bootstrap | 27 +++------------------------
2 files changed, 3 insertions(+), 26 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
