From f9b6a0b90d8490cefb915f465156ee5542b7cc33 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Fri, 27 Apr 2001 11:53:29 -0400 Subject: [PATCH] BUG: run cache build with each configure --- configure.in.sample | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/configure.in.sample b/configure.in.sample index 9ed648baf..6b15fa84f 100644 --- a/configure.in.sample +++ b/configure.in.sample @@ -629,18 +629,23 @@ CMake/Source/Makefile ) -# force a rebuild of rulesgen which will rebuild CMakeTargets.make -# this has to be done because configure generates empty CMakeTargets.make files -# for makes other than gnu. -rm -f CMake/Source/CMakeBuildTargets -rm -f CMake/Source/CMakeBuildTargets.exe + + + + # build the CMakeBuildTargets program -(cd CMake/Source; make CMakeBuildTargets) +(cd CMake/Source; $MAKECOMMAND CMakeBuildTargets) # if there is no cache file then create one if test ! -f $CMAKE_CONFIG_DIR/CMakeCache.txt; then - echo CMake/Source/CMakeBuildTargets.exe ${fullSrcDir}/CMakeLists.txt -MakeCache -S${fullSrcDir} -O${CMAKE_CONFIG_DIR} -H${fullSrcDir} -B${CMAKE_CONFIG_DIR} - CMake/Source/CMakeBuildTargets.exe ${fullSrcDir}/CMakeLists.txt -MakeCache -S${fullSrcDir} -O${CMAKE_CONFIG_DIR} -H${fullSrcDir} -B${CMAKE_CONFIG_DIR} + echo CMake/Source/CMakeBuildTargets ${fullSrcDir}/CMakeLists.txt -MakeCache -S${fullSrcDir} -O${CMAKE_CONFIG_DIR} -H${fullSrcDir} -B${CMAKE_CONFIG_DIR} + CMake/Source/CMakeBuildTargets ${fullSrcDir}/CMakeLists.txt -MakeCache -S${fullSrcDir} -O${CMAKE_CONFIG_DIR} -H${fullSrcDir} -B${CMAKE_CONFIG_DIR} fi echo CMakeCache.txt location: ${CMAKE_CONFIG_DIR}/CMakeCache.txt +# force a rebuild of CMakeBuildTargets which will rebuild CMakeTargets.make +# this has to be done because configure generates empty CMakeTargets.make files +# and make programs other than gnu do not like to include make file fragments +# that do not exist, even if they know how to create them. +rm -f CMake/Source/CMakeBuildTargets +rm -f CMake/Source/CMakeBuildTargets.exe