summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2003-12-08 19:11:58 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2003-12-08 19:11:58 (GMT)
commitaa859a760329c3a8d677974735f4c06211a8d8f2 (patch)
treef5d56089d59669b3ea380e624fa42c5b58ab6dd7
parent6df489c471eca80100bf720b4b5cde2cbd3b12d6 (diff)
downloadCMake-aa859a760329c3a8d677974735f4c06211a8d8f2.zip
CMake-aa859a760329c3a8d677974735f4c06211a8d8f2.tar.gz
CMake-aa859a760329c3a8d677974735f4c06211a8d8f2.tar.bz2
ENH: Fix bootstrap to handle lex parser
-rwxr-xr-xbootstrap17
1 files changed, 13 insertions, 4 deletions
diff --git a/bootstrap b/bootstrap
index 254bb3f..04c7c24 100755
--- a/bootstrap
+++ b/bootstrap
@@ -21,7 +21,7 @@ CMAKE_KNOWN_C_COMPILERS="cc gcc xlc icc tcc"
CMAKE_KNOWN_CXX_COMPILERS="CC g++ c++ xlC icc como aCC"
CMAKE_KNOWN_MAKE_PROCESSORS="make gmake"
-CMAKE_SOURCES="\
+CMAKE_CXX_SOURCES="\
cmake \
cmakewizard \
cmakemain \
@@ -43,6 +43,10 @@ CMAKE_SOURCES="\
cmVariableWatch \
cmSourceGroup"
+CMAKE_C_SOURCES="\
+ cmListFileLexer \
+ "
+
KWSYS_C_SOURCES="\
ProcessUNIX"
@@ -554,7 +558,7 @@ cmake_report cmConfigure.h.tmp " *"
cmake_report cmConfigure.h.tmp " * Make: ${cmake_make_processor}"
cmake_report cmConfigure.h.tmp " *"
cmake_report cmConfigure.h.tmp " * Sources:"
-cmake_report cmConfigure.h.tmp " * ${CMAKE_SOURCES}"
+cmake_report cmConfigure.h.tmp " * ${CMAKE_CXX_SOURCES} ${CMAKE_C_SOURCES}"
cmake_report cmConfigure.h.tmp " * kwSys Sources:"
cmake_report cmConfigure.h.tmp " * ${KWSYS_CXX_SOURCES} ${KWSYS_C_SOURCES}"
cmake_report cmConfigure.h.tmp " */"
@@ -653,7 +657,7 @@ done
# Generate Makefile
dep="cmConfigure.h `cmake_escape \"${cmake_source_dir}\"`/Source/*.h"
objs=""
-for a in ${CMAKE_SOURCES} ${KWSYS_CXX_SOURCES} ${KWSYS_C_SOURCES}; do
+for a in ${CMAKE_CXX_SOURCES} ${CMAKE_C_SOURCES} ${KWSYS_CXX_SOURCES} ${KWSYS_C_SOURCES}; do
objs="${objs} ${a}.o"
done
@@ -673,11 +677,16 @@ cmake_c_flags="${cmake_c_flags}-I`cmake_escape \"${cmake_source_dir}/Source\"` -
cmake_cxx_flags="${cmake_cxx_flags}-I`cmake_escape \"${cmake_source_dir}/Source\"` -I`cmake_escape \"${cmake_bootstrap_dir}\"`"
echo "cmake: ${objs}" > "${cmake_bootstrap_dir}/Makefile"
echo " ${cmake_cxx_compiler} ${LDFLAGS} ${cmake_cxx_flags} ${objs} -o cmake" >> "${cmake_bootstrap_dir}/Makefile"
-for a in ${CMAKE_SOURCES}; do
+for a in ${CMAKE_CXX_SOURCES}; do
src=`cmake_escape "${cmake_source_dir}/Source/${a}.cxx"`
echo "${a}.o : ${src} ${dep}" >> "${cmake_bootstrap_dir}/Makefile"
echo " ${cmake_cxx_compiler} ${cmake_cxx_flags} -c ${src} -o ${a}.o" >> "${cmake_bootstrap_dir}/Makefile"
done
+for a in ${CMAKE_C_SOURCES}; do
+ src=`cmake_escape "${cmake_source_dir}/Source/${a}.c"`
+ 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}; do
src=`cmake_escape "${cmake_source_dir}/Source/kwsys/${a}.c"`
echo "${a}.o : ${src} ${dep}" >> "${cmake_bootstrap_dir}/Makefile"