Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
12553a2e
Commit
12553a2e
authored
May 30, 2018
by
Mark OLESEN
Browse files
COMP: include /usr/local in search for system headers/libraries
- this is consistent with compiler defaults, and helps Darwin users
parent
e43ae3f2
Changes
10
Hide whitespace changes
Inline
Side-by-side
wmake/rules/General/CGAL
View file @
12553a2e
...
...
@@ -3,6 +3,7 @@ CGAL_INC = \
-I$(MPFR_ARCH_PATH)/include \
-I$(BOOST_ARCH_PATH)/include \
-I$(CGAL_ARCH_PATH)/include \
-I/usr/local/include \
-I/usr/include
CGAL_LIBS = \
...
...
wmake/scripts/have_boost
View file @
12553a2e
...
...
@@ -82,12 +82,23 @@ have_boost()
)
elif
isSystem
"
$BOOST_ARCH_PATH
"
then
header
=
$(
findFirstFile /usr/include/
$header
)
library
=
$(
findFirstFile
\
/usr/lib/
$library
\
/usr/lib
$WM_COMPILER_LIB_ARCH
/
$library
\
)
header
=
$(
findFirstFile /usr/local/include/
$header
/usr/include/
$header
)
case
"
$header
"
in
/usr/local/
*
)
library
=
$(
findFirstFile
\
/usr/local/lib/
$library
\
/usr/local/lib
$WM_COMPILER_LIB_ARCH
/
$library
\
)
;;
*
)
library
=
$(
findFirstFile
\
/usr/lib/
$library
\
/usr/lib
$WM_COMPILER_LIB_ARCH
/
$library
\
)
;;
esac
else
unset
header library
fi
...
...
wmake/scripts/have_cgal
View file @
12553a2e
...
...
@@ -82,12 +82,23 @@ have_cgal()
)
elif
isSystem
"
$CGAL_ARCH_PATH
"
then
header
=
$(
findFirstFile /usr/include/
$header
)
library
=
$(
findFirstFile
\
/usr/lib/
$library
\
/usr/lib
$WM_COMPILER_LIB_ARCH
/
$library
\
)
header
=
$(
findFirstFile /usr/local/include/
$header
/usr/include/
$header
)
case
"
$header
"
in
/usr/local/
*
)
library
=
$(
findFirstFile
\
/usr/local/lib/
$library
\
/usr/local/lib
$WM_COMPILER_LIB_ARCH
/
$library
\
)
;;
*
)
library
=
$(
findFirstFile
\
/usr/lib/
$library
\
/usr/lib
$WM_COMPILER_LIB_ARCH
/
$library
\
)
;;
esac
else
unset
header library
fi
...
...
wmake/scripts/have_fftw
View file @
12553a2e
...
...
@@ -82,12 +82,23 @@ have_fftw()
)
elif
isSystem
"
$FFTW_ARCH_PATH
"
then
header
=
$(
findFirstFile /usr/include/
$header
)
library
=
$(
findFirstFile
\
/usr/lib/
$library
\
/usr/lib
$WM_COMPILER_LIB_ARCH
/
$library
\
)
header
=
$(
findFirstFile /usr/local/include/
$header
/usr/include/
$header
)
case
"
$header
"
in
/usr/local/
*
)
library
=
$(
findFirstFile
\
/usr/local/lib/
$library
\
/usr/local/lib
$WM_COMPILER_LIB_ARCH
/
$library
\
)
;;
*
)
library
=
$(
findFirstFile
\
/usr/lib/
$library
\
/usr/lib
$WM_COMPILER_LIB_ARCH
/
$library
\
)
;;
esac
else
unset
header library
fi
...
...
wmake/scripts/have_kahip
View file @
12553a2e
...
...
@@ -90,12 +90,23 @@ have_kahip()
)
elif
isSystem
"
$KAHIP_ARCH_PATH
"
then
header
=
$(
findFirstFile /usr/include/
$header
)
library
=
$(
findFirstFile
\
/usr/lib/
$library
\
/usr/lib
$WM_COMPILER_LIB_ARCH
/
$library
\
)
header
=
$(
findFirstFile /usr/local/include/
$header
/usr/include/
$header
)
case
"
$header
"
in
/usr/local/
*
)
library
=
$(
findFirstFile
\
/usr/local/lib/
$library
\
/usr/local/lib
$WM_COMPILER_LIB_ARCH
/
$library
\
)
;;
*
)
library
=
$(
findFirstFile
\
/usr/lib/
$library
\
/usr/lib
$WM_COMPILER_LIB_ARCH
/
$library
\
)
;;
esac
else
unset
header library
fi
...
...
wmake/scripts/have_metis
View file @
12553a2e
...
...
@@ -91,12 +91,23 @@ have_metis()
)
elif
isSystem
"
$METIS_ARCH_PATH
"
then
header
=
$(
findFirstFile /usr/include/
$header
)
library
=
$(
findFirstFile
\
/usr/lib/
$library
\
/usr/lib
$WM_COMPILER_LIB_ARCH
/
$library
\
)
header
=
$(
findFirstFile /usr/local/include/
$header
/usr/include/
$header
)
case
"
$header
"
in
/usr/local/
*
)
library
=
$(
findFirstFile
\
/usr/local/lib/
$library
\
/usr/local/lib
$WM_COMPILER_LIB_ARCH
/
$library
\
)
;;
*
)
library
=
$(
findFirstFile
\
/usr/lib/
$library
\
/usr/lib
$WM_COMPILER_LIB_ARCH
/
$library
\
)
;;
esac
else
unset
header library
fi
...
...
wmake/scripts/have_mgridgen
View file @
12553a2e
...
...
@@ -91,12 +91,23 @@ have_mgridgen()
)
elif
isSystem
"
$MGRIDGEN_ARCH_PATH
"
then
header
=
$(
findFirstFile /usr/include/
$header
)
library
=
$(
findFirstFile
\
/usr/lib/
$library
\
/usr/lib
$WM_COMPILER_LIB_ARCH
/
$library
\
)
header
=
$(
findFirstFile /usr/local/include/
$header
/usr/include/
$header
)
case
"
$header
"
in
/usr/local/
*
)
library
=
$(
findFirstFile
\
/usr/local/lib/
$library
\
/usr/local/lib
$WM_COMPILER_LIB_ARCH
/
$library
\
)
;;
*
)
library
=
$(
findFirstFile
\
/usr/lib/
$library
\
/usr/lib
$WM_COMPILER_LIB_ARCH
/
$library
\
)
;;
esac
else
unset
header library
fi
...
...
wmake/scripts/have_readline
View file @
12553a2e
...
...
@@ -61,12 +61,23 @@ have_readline()
library
=
"libreadline
$extLibso
"
# System only?
header
=
$(
findFirstFile /usr/include/
$header
)
library
=
$(
findFirstFile
\
/usr/lib/
$library
\
/usr/lib
$WM_COMPILER_LIB_ARCH
/
$library
\
)
header
=
$(
findFirstFile /usr/local/include/
$header
/usr/include/
$header
)
case
"
$header
"
in
/usr/local/
*
)
library
=
$(
findFirstFile
\
/usr/local/lib/
$library
\
/usr/local/lib
$WM_COMPILER_LIB_ARCH
/
$library
\
)
;;
*
)
library
=
$(
findFirstFile
\
/usr/lib/
$library
\
/usr/lib
$WM_COMPILER_LIB_ARCH
/
$library
\
)
;;
esac
# Header found?
[
-n
"
$header
"
]
||
{
...
...
wmake/scripts/have_scotch
View file @
12553a2e
...
...
@@ -91,12 +91,28 @@ have_scotch()
)
elif
isSystem
"
$SCOTCH_ARCH_PATH
"
then
header
=
$(
findFirstFile
/usr/include/
$header
/usr/include/scotch/
$header
)
library
=
$(
findFirstFile
\
/usr/
lib/
$library
\
/usr/
lib
$WM_COMPILER_LIB_ARCH
/
$library
\
header
=
$(
findFirstFile
\
/usr/local/include/
$header
\
/usr/local/include/scotch/
$header
\
/usr/
include/
$header
\
/usr/
include/scotch/
$header
\
)
case
"
$header
"
in
/usr/local/
*
)
library
=
$(
findFirstFile
\
/usr/local/lib/
$library
\
/usr/local/lib
$WM_COMPILER_LIB_ARCH
/
$library
\
)
;;
*
)
library
=
$(
findFirstFile
\
/usr/lib/
$library
\
/usr/lib
$WM_COMPILER_LIB_ARCH
/
$library
\
)
;;
esac
else
unset
header library
fi
...
...
wmake/scripts/have_zoltan
View file @
12553a2e
...
...
@@ -90,12 +90,23 @@ have_zoltan()
)
elif
isSystem
"
$ZOLTAN_ARCH_PATH
"
then
header
=
$(
findFirstFile /usr/include/
$header
)
library
=
$(
findFirstFile
\
/usr/lib/
$library
\
/usr/lib
$WM_COMPILER_LIB_ARCH
/
$library
\
)
header
=
$(
findFirstFile /usr/local/include/
$header
/usr/include/
$header
)
case
"
$header
"
in
/usr/local/
*
)
library
=
$(
findFirstFile
\
/usr/local/lib/
$library
\
/usr/local/lib
$WM_COMPILER_LIB_ARCH
/
$library
\
)
;;
*
)
library
=
$(
findFirstFile
\
/usr/lib/
$library
\
/usr/lib
$WM_COMPILER_LIB_ARCH
/
$library
\
)
;;
esac
else
unset
header library
fi
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment