From 1c715bbc963cab38065f5c107e3db85442e56751 Mon Sep 17 00:00:00 2001
From: Martin Beaudoin <beaudoin.martin@ireq.ca>
Date: Sat, 4 Jun 2011 18:55:09 -0400
Subject: [PATCH] Adjustments for cmake

---
 ThirdParty/AllMake.stage1                                  | 3 ++-
 etc/settings.sh                                            | 7 +++++--
 .../fluid/constant/polyMesh/blockMeshDict                  | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ThirdParty/AllMake.stage1 b/ThirdParty/AllMake.stage1
index e3d81e87f..019a43372 100755
--- a/ThirdParty/AllMake.stage1
+++ b/ThirdParty/AllMake.stage1
@@ -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
diff --git a/etc/settings.sh b/etc/settings.sh
index 7b8efe568..d100c5b90 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -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"
 
diff --git a/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/polyMesh/blockMeshDict b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/polyMesh/blockMeshDict
index c3a05af63..1eab17e28 100644
--- a/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/polyMesh/blockMeshDict
+++ b/tutorials/stressAnalysis/icoFsiFoam/flappingConsoleSmall/fluid/constant/polyMesh/blockMeshDict
@@ -97,4 +97,4 @@ mergePatchPairs
 );
 
 
-// ************************************************************************* //
\ No newline at end of file
+// ************************************************************************* //