mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
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.
This commit is contained in:
@ -41,7 +41,7 @@ cleanedEnv=`$WM_PROJECT_DIR/bin/foamCleanPath "$PATH" "$WM_THIRD_PARTY_DIR/cmake
|
|||||||
unset CMAKE_HOME
|
unset CMAKE_HOME
|
||||||
for cmake in cmake-2.8.0 cmake-2.6.4 cmake-2.6.2 cmake-2.4.6
|
for cmake in cmake-2.8.0 cmake-2.6.4 cmake-2.6.2 cmake-2.4.6
|
||||||
do
|
do
|
||||||
cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH/$cmake
|
cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake
|
||||||
if [ -r $cmake ]
|
if [ -r $cmake ]
|
||||||
then
|
then
|
||||||
export CMAKE_HOME=$cmake
|
export CMAKE_HOME=$cmake
|
||||||
|
|||||||
@ -41,7 +41,7 @@ if ( $status == 0 ) set path=($cleanedEnv)
|
|||||||
# determine the cmake to be used
|
# determine the cmake to be used
|
||||||
unsetenv CMAKE_HOME
|
unsetenv CMAKE_HOME
|
||||||
foreach cmake ( cmake-2.8.0 cmake-2.6.4 cmake-2.6.2 cmake-2.4.6 )
|
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
|
if ( -r $cmake ) then
|
||||||
setenv CMAKE_HOME $cmake
|
setenv CMAKE_HOME $cmake
|
||||||
set path=($CMAKE_HOME/bin $path)
|
set path=($CMAKE_HOME/bin $path)
|
||||||
|
|||||||
Reference in New Issue
Block a user