From 2b83f9f8fd19eceb953fa966a49cdef33be60e77 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Wed, 10 Mar 2010 14:39:11 +0100
Subject: [PATCH] COMP: move CMAKE binaries from $WM_ARCH ->
$WM_ARCH$WM_COMPILER
We should assume that they've been compiled with the current OpenFOAM
compiler settings and may have compiler-specific runtime requirements.
---
etc/apps/paraview3/bashrc | 2 +-
etc/apps/paraview3/cshrc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/etc/apps/paraview3/bashrc b/etc/apps/paraview3/bashrc
index 2ef50d5790a..83f8294c001 100644
--- a/etc/apps/paraview3/bashrc
+++ b/etc/apps/paraview3/bashrc
@@ -41,7 +41,7 @@ cleanedEnv=`$WM_PROJECT_DIR/bin/foamCleanPath "$PATH" "$WM_THIRD_PARTY_DIR/cmake
unset CMAKE_HOME
for cmake in cmake-2.8.0 cmake-2.6.4 cmake-2.6.2 cmake-2.4.6
do
- cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH/$cmake
+ cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake
if [ -r $cmake ]
then
export CMAKE_HOME=$cmake
diff --git a/etc/apps/paraview3/cshrc b/etc/apps/paraview3/cshrc
index e7cc8c05d1d..ac89e09cd32 100644
--- a/etc/apps/paraview3/cshrc
+++ b/etc/apps/paraview3/cshrc
@@ -41,7 +41,7 @@ if ( $status == 0 ) set path=($cleanedEnv)
# determine the cmake to be used
unsetenv CMAKE_HOME
foreach cmake ( cmake-2.8.0 cmake-2.6.4 cmake-2.6.2 cmake-2.4.6 )
- set cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH/$cmake
+ set cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake
if ( -r $cmake ) then
setenv CMAKE_HOME $cmake
set path=($CMAKE_HOME/bin $path)
--
GitLab