mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Merge branch 'master' into cvm
This commit is contained in:
Binary file not shown.
@ -38,7 +38,7 @@ cleaned=`$WM_PROJECT_DIR/bin/foamCleanPath "$PATH" "$WM_THIRD_PARTY_DIR/platform
|
|||||||
|
|
||||||
# determine the cmake to be used
|
# determine the cmake to be used
|
||||||
unset CMAKE_HOME
|
unset CMAKE_HOME
|
||||||
for cmake in cmake-2.8.3 cmake-2.8.1
|
for cmake in cmake-2.8.4 cmake-2.8.3 cmake-2.8.1
|
||||||
do
|
do
|
||||||
cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake
|
cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake
|
||||||
if [ -r $cmake ]
|
if [ -r $cmake ]
|
||||||
|
|||||||
@ -39,7 +39,7 @@ if ( $status == 0 ) setenv PATH $cleaned
|
|||||||
|
|
||||||
# determine the cmake to be used
|
# determine the cmake to be used
|
||||||
unsetenv CMAKE_HOME
|
unsetenv CMAKE_HOME
|
||||||
foreach cmake ( cmake-2.8.3 cmake-2.8.1 )
|
foreach cmake ( cmake-2.8.4 cmake-2.8.3 cmake-2.8.1 )
|
||||||
set cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$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
|
||||||
|
|||||||
@ -229,7 +229,7 @@ endif
|
|||||||
# boost and CGAL
|
# boost and CGAL
|
||||||
# ~~~~~~~~~~~~~~
|
# ~~~~~~~~~~~~~~
|
||||||
|
|
||||||
set boost_version=boost_1_42_0
|
set boost_version=boost_1_45_0
|
||||||
set cgal_version=CGAL-3.7
|
set cgal_version=CGAL-3.7
|
||||||
|
|
||||||
setenv BOOST_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
|
setenv BOOST_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
|
||||||
|
|||||||
Reference in New Issue
Block a user