From 95e65ecfa50fe19df9b1984dfae21d22c46f5a5a Mon Sep 17 00:00:00 2001 From: Martin Beaudoin Date: Wed, 17 Aug 2011 19:30:10 -0700 Subject: [PATCH] ThirdParty packages: switch to cmake 2.8.5 --- ThirdParty/AllMake.stage1 | 2 +- etc/settings.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ThirdParty/AllMake.stage1 b/ThirdParty/AllMake.stage1 index e3d81e87f..224b6c436 100755 --- a/ThirdParty/AllMake.stage1 +++ b/ThirdParty/AllMake.stage1 @@ -89,7 +89,7 @@ echo #( rpm_make -p flex-2.5.35 -s flex-2.5.35.spec -u http://downloads.sourceforge.net/project/flex/flex/flex-2.5.35/flex-2.5.35.tar.gz ) # cmake -( rpm_make -p cmake-2.8.3 -s cmake-2.8.3.spec -u http://www.cmake.org/files/v2.8/cmake-2.8.3.tar.gz ) +( rpm_make -p cmake-2.8.5 -s cmake-2.8.5.spec -u http://www.cmake.org/files/v2.8/cmake-2.8.5.tar.gz ) echo ======================================== echo Done ThirdParty AllMake: Stage1 diff --git a/etc/settings.sh b/etc/settings.sh index c5f5c4b82..4ee1d8a4b 100644 --- a/etc/settings.sh +++ b/etc/settings.sh @@ -480,8 +480,8 @@ export MPI_BUFFER_SIZE # Load cmake # ~~~~~~~~~~ -[ -z "$CMAKE_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/cmake-2.8.3 ] && { - _foamSource $WM_THIRD_PARTY_DIR/packages/cmake-2.8.3/platforms/$WM_OPTIONS/etc/cmake-2.8.3.sh +[ -z "$CMAKE_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/cmake-2.8.5 ] && { + _foamSource $WM_THIRD_PARTY_DIR/packages/cmake-2.8.5/platforms/$WM_OPTIONS/etc/cmake-2.8.5.sh } [ "$FOAM_VERBOSE" -a "$PS1" ] && echo " CMAKE_DIR is initialized to: $CMAKE_DIR"