mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev
This commit is contained in:
@ -52,7 +52,7 @@ case Linux:
|
||||
case x86_64:
|
||||
switch ($WM_ARCH_OPTION)
|
||||
case 32:
|
||||
setenv WM_COMPILER_ARCH '-64'
|
||||
setenv WM_COMPILER_ARCH 64
|
||||
setenv WM_CC 'gcc'
|
||||
setenv WM_CXX 'g++'
|
||||
setenv WM_CFLAGS '-m32 -fPIC'
|
||||
@ -343,7 +343,7 @@ endif
|
||||
# ~~~~~~~~~~~~~~
|
||||
|
||||
set boost_version=boost_1_45_0
|
||||
set cgal_version=CGAL-3.7
|
||||
set cgal_version=CGAL-3.8
|
||||
|
||||
setenv BOOST_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
|
||||
setenv CGAL_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version
|
||||
|
||||
@ -76,7 +76,7 @@ Linux)
|
||||
x86_64)
|
||||
case "$WM_ARCH_OPTION" in
|
||||
32)
|
||||
export WM_COMPILER_ARCH='-64'
|
||||
export WM_COMPILER_ARCH=64
|
||||
export WM_CC='gcc'
|
||||
export WM_CXX='g++'
|
||||
export WM_CFLAGS='-m32 -fPIC'
|
||||
@ -361,7 +361,7 @@ fi
|
||||
# ~~~~~~~~~~~~~~
|
||||
|
||||
boost_version=boost_1_45_0
|
||||
cgal_version=CGAL-3.7
|
||||
cgal_version=CGAL-3.8
|
||||
|
||||
export BOOST_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
|
||||
export CGAL_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version
|
||||
|
||||
Reference in New Issue
Block a user