Skip to content
Snippets Groups Projects
Commit 2b83f9f8 authored by Mark Olesen's avatar Mark Olesen
Browse files

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.
parent d239cc05
Branches
Tags
No related merge requests found
......@@ -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
......
......@@ -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)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment