From 12553a2e4382b6d67a3609bb8d4267f6e87272bd Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 30 May 2018 14:45:12 +0200 Subject: [PATCH] COMP: include /usr/local in search for system headers/libraries - this is consistent with compiler defaults, and helps Darwin users --- wmake/rules/General/CGAL | 1 + wmake/scripts/have_boost | 21 ++++++++++++++++----- wmake/scripts/have_cgal | 21 ++++++++++++++++----- wmake/scripts/have_fftw | 21 ++++++++++++++++----- wmake/scripts/have_kahip | 21 ++++++++++++++++----- wmake/scripts/have_metis | 21 ++++++++++++++++----- wmake/scripts/have_mgridgen | 21 ++++++++++++++++----- wmake/scripts/have_readline | 21 ++++++++++++++++----- wmake/scripts/have_scotch | 26 +++++++++++++++++++++----- wmake/scripts/have_zoltan | 21 ++++++++++++++++----- 10 files changed, 150 insertions(+), 45 deletions(-) diff --git a/wmake/rules/General/CGAL b/wmake/rules/General/CGAL index f6c32e1bb6..1606a2a8eb 100644 --- a/wmake/rules/General/CGAL +++ b/wmake/rules/General/CGAL @@ -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 = \ diff --git a/wmake/scripts/have_boost b/wmake/scripts/have_boost index c1cd39dbc1..e78d8ab228 100644 --- a/wmake/scripts/have_boost +++ b/wmake/scripts/have_boost @@ -82,12 +82,23 @@ have_boost() ) elif isSystem "$BOOST_ARCH_PATH" then - header=$(findFirstFile /usr/include/$header) + header=$(findFirstFile /usr/local/include/$header /usr/include/$header) - library=$(findFirstFile \ - /usr/lib/$library \ - /usr/lib$WM_COMPILER_LIB_ARCH/$library \ - ) + 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 diff --git a/wmake/scripts/have_cgal b/wmake/scripts/have_cgal index 9c14b0caec..d641ccad25 100644 --- a/wmake/scripts/have_cgal +++ b/wmake/scripts/have_cgal @@ -82,12 +82,23 @@ have_cgal() ) elif isSystem "$CGAL_ARCH_PATH" then - header=$(findFirstFile /usr/include/$header) + header=$(findFirstFile /usr/local/include/$header /usr/include/$header) - library=$(findFirstFile \ - /usr/lib/$library \ - /usr/lib$WM_COMPILER_LIB_ARCH/$library \ - ) + 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 diff --git a/wmake/scripts/have_fftw b/wmake/scripts/have_fftw index d3e87c5dab..1a899b0504 100644 --- a/wmake/scripts/have_fftw +++ b/wmake/scripts/have_fftw @@ -82,12 +82,23 @@ have_fftw() ) elif isSystem "$FFTW_ARCH_PATH" then - header=$(findFirstFile /usr/include/$header) + header=$(findFirstFile /usr/local/include/$header /usr/include/$header) - library=$(findFirstFile \ - /usr/lib/$library \ - /usr/lib$WM_COMPILER_LIB_ARCH/$library \ - ) + 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 diff --git a/wmake/scripts/have_kahip b/wmake/scripts/have_kahip index 84e8cbde35..3dcf7c952b 100644 --- a/wmake/scripts/have_kahip +++ b/wmake/scripts/have_kahip @@ -90,12 +90,23 @@ have_kahip() ) elif isSystem "$KAHIP_ARCH_PATH" then - header=$(findFirstFile /usr/include/$header) + header=$(findFirstFile /usr/local/include/$header /usr/include/$header) - library=$(findFirstFile \ - /usr/lib/$library \ - /usr/lib$WM_COMPILER_LIB_ARCH/$library \ - ) + 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 diff --git a/wmake/scripts/have_metis b/wmake/scripts/have_metis index ec5b185c04..4075286418 100644 --- a/wmake/scripts/have_metis +++ b/wmake/scripts/have_metis @@ -91,12 +91,23 @@ have_metis() ) elif isSystem "$METIS_ARCH_PATH" then - header=$(findFirstFile /usr/include/$header) + header=$(findFirstFile /usr/local/include/$header /usr/include/$header) - library=$(findFirstFile \ - /usr/lib/$library \ - /usr/lib$WM_COMPILER_LIB_ARCH/$library \ - ) + 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 diff --git a/wmake/scripts/have_mgridgen b/wmake/scripts/have_mgridgen index 3c232c43fb..d8900a5662 100644 --- a/wmake/scripts/have_mgridgen +++ b/wmake/scripts/have_mgridgen @@ -91,12 +91,23 @@ have_mgridgen() ) elif isSystem "$MGRIDGEN_ARCH_PATH" then - header=$(findFirstFile /usr/include/$header) + header=$(findFirstFile /usr/local/include/$header /usr/include/$header) - library=$(findFirstFile \ - /usr/lib/$library \ - /usr/lib$WM_COMPILER_LIB_ARCH/$library \ - ) + 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 diff --git a/wmake/scripts/have_readline b/wmake/scripts/have_readline index db85cdf0e8..9f9509e40f 100644 --- a/wmake/scripts/have_readline +++ b/wmake/scripts/have_readline @@ -61,12 +61,23 @@ have_readline() library="libreadline$extLibso" # System only? - header=$(findFirstFile /usr/include/$header) + header=$(findFirstFile /usr/local/include/$header /usr/include/$header) - library=$(findFirstFile \ - /usr/lib/$library \ - /usr/lib$WM_COMPILER_LIB_ARCH/$library \ - ) + 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" ] || { diff --git a/wmake/scripts/have_scotch b/wmake/scripts/have_scotch index bf613acf39..98c298c221 100644 --- a/wmake/scripts/have_scotch +++ b/wmake/scripts/have_scotch @@ -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 diff --git a/wmake/scripts/have_zoltan b/wmake/scripts/have_zoltan index bd02ac54a4..40d7a7d26c 100644 --- a/wmake/scripts/have_zoltan +++ b/wmake/scripts/have_zoltan @@ -90,12 +90,23 @@ have_zoltan() ) elif isSystem "$ZOLTAN_ARCH_PATH" then - header=$(findFirstFile /usr/include/$header) + header=$(findFirstFile /usr/local/include/$header /usr/include/$header) - library=$(findFirstFile \ - /usr/lib/$library \ - /usr/lib$WM_COMPILER_LIB_ARCH/$library \ - ) + 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