Merging from 1.6 release branch.

This commit is contained in:
Brad King 2003-03-13 15:59:53 -05:00
parent d055d402f7
commit 8ddf060b05
2 changed files with 4 additions and 5 deletions

View File

@ -275,7 +275,7 @@ utilities()
rm -rf CheckoutTemp && rm -rf CheckoutTemp &&
mkdir CheckoutTemp && mkdir CheckoutTemp &&
cd CheckoutTemp && cd CheckoutTemp &&
cvs -q -z3 -d $CVSROOT co CMake/Utilities/Release && cvs -q -z3 -d $CVSROOT co -r ${TAG} CMake/Utilities/Release &&
mv CMake/Utilities/Release ../ReleaseUtilities && mv CMake/Utilities/Release ../ReleaseUtilities &&
cd .. && cd .. &&
rm -rf CheckoutTemp rm -rf CheckoutTemp

View File

@ -1,15 +1,14 @@
PLATFORM="x86-linux-static" PLATFORM="x86-linux"
CURSES_LIBRARY="/usr/lib/libcurses.a" CURSES_LIBRARY="/usr/lib/libcurses.a"
FORM_LIBRARY="/usr/lib/libform.a" FORM_LIBRARY="/usr/lib/libform.a"
CC="gcc" CC="gcc304s"
CXX="c++" CXX="c++304s"
# Write entries into the cache file before building cmake. # Write entries into the cache file before building cmake.
write_cache() write_cache()
{ {
cat > CMakeCache.txt <<EOF cat > CMakeCache.txt <<EOF
BUILD_TESTING:BOOL=ON BUILD_TESTING:BOOL=ON
CMAKE_EXE_LINKER_FLAGS:STRING=-static
CMAKE_SKIP_RPATH:BOOL=1 CMAKE_SKIP_RPATH:BOOL=1
CMAKE_VERBOSE_MAKEFILE:BOOL=TRUE CMAKE_VERBOSE_MAKEFILE:BOOL=TRUE
CURSES_LIBRARY:FILEPATH=${CURSES_LIBRARY} CURSES_LIBRARY:FILEPATH=${CURSES_LIBRARY}