Adjustments for cmake

This commit is contained in:
Martin Beaudoin 2011-06-04 18:55:09 -04:00
parent 500b61e503
commit 1c715bbc96
3 changed files with 8 additions and 4 deletions

View file

@ -89,7 +89,8 @@ 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.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.git -s cmake-2.8.git.spec -u http://www.cmake.org/files/v2.8/cmake-2.8.git.tar.gz )
echo ========================================
echo Done ThirdParty AllMake: Stage1

View file

@ -480,8 +480,11 @@ 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.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.git ] && {
_foamSource $WM_THIRD_PARTY_DIR/packages/cmake-2.8.git/platforms/$WM_OPTIONS/etc/cmake-2.8.git.sh
}
[ "$FOAM_VERBOSE" -a "$PS1" ] && echo " CMAKE_DIR is initialized to: $CMAKE_DIR"

View file

@ -97,4 +97,4 @@ mergePatchPairs
);
// ************************************************************************* //
// ************************************************************************* //