[Cmake-commits] [cmake-commits] king committed bootstrap 1.118 1.119

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake
In directory public:/mounts/ram/cvs-serv31202

Modified Files:
	bootstrap 
Log Message:
COMP: Avoid String.c inclusion by Compaq templates

The Compaq compiler (on VMS) includes 'String.c' in source files that
use the stl string while looking for template definitions.  This was the
true cause of double-inclusion of the 'kwsysPrivate.h' header.  We work
around the problem by conditionally compiling the entire source file on
a condition only true when really building the source.


Index: bootstrap
===================================================================
RCS file: /cvsroot/CMake/CMake/bootstrap,v
retrieving revision 1.118
retrieving revision 1.119
diff -C 2 -d -r1.118 -r1.119
*** bootstrap	27 May 2009 15:33:37 -0000	1.118
--- bootstrap	10 Jun 2009 15:46:06 -0000	1.119
***************
*** 1287,1290 ****
--- 1287,1291 ----
  fi
  
+ cmake_c_flags_String="-DKWSYS_STRING_C"
  cmake_c_flags="${cmake_c_flags}-I`cmake_escape \"${cmake_source_dir}/Source\"` \
    -I`cmake_escape \"${cmake_bootstrap_dir}\"`"
***************
*** 1306,1311 ****
  for a in ${KWSYS_C_SOURCES} ${KWSYS_C_MINGW_SOURCES}; do
    src=`cmake_escape "${cmake_source_dir}/Source/kwsys/${a}.c"`
    echo "${a}.o : ${src} ${dep}" >> "${cmake_bootstrap_dir}/Makefile"
!   echo "	${cmake_c_compiler} ${cmake_c_flags} -DKWSYS_NAMESPACE=cmsys -c ${src} -o ${a}.o" >> "${cmake_bootstrap_dir}/Makefile"
  done
  for a in ${KWSYS_CXX_SOURCES}; do
--- 1307,1313 ----
  for a in ${KWSYS_C_SOURCES} ${KWSYS_C_MINGW_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"
!   echo "	${cmake_c_compiler} ${cmake_c_flags} -DKWSYS_NAMESPACE=cmsys ${src_flags} -c ${src} -o ${a}.o" >> "${cmake_bootstrap_dir}/Makefile"
  done
  for a in ${KWSYS_CXX_SOURCES}; do