fix fedora (#221)

* use CMAKE_INSTALL_LIBDIR & fix cmake call * fix ExternalLibsExtractor.sh when arma_libs-NOTFOUND
libKriging · Oct 27, 2022 · 432f049 · 432f049
1 parent 051ca8f
commit 432f049
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.travis-ci/linux-macos/build.sh b/.travis-ci/linux-macos/build.sh
@@ -9,6 +9,7 @@ fi
 # Default configuration when used out of travis-ci
 MODE=${MODE:-Debug}
 EXTRA_CMAKE_OPTIONS=${EXTRA_CMAKE_OPTIONS:-}
+EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DCMAKE_INSTALL_LIBDIR=lib" # avoid using "lib64" for some distros
 BUILD_TEST=${BUILD_TEST:-true}
 
 export ENABLE_OCTAVE_BINDING=${ENABLE_OCTAVE_BINDING:-auto}

diff --git a/bindings/R/tools/ExternalLibsExtractor.sh b/bindings/R/tools/ExternalLibsExtractor.sh
@@ -12,5 +12,7 @@ BASEDIR=$(cd "$BASEDIR" && pwd -P)
 
 TMPDIR=$(mktemp -d)
 ARMA_LIBS=$(cmake -DLIBKRIGING_PATH="${LIBKRIGING_PATH}" -B "${TMPDIR}" "${BASEDIR}" | sed -n -r -e 's/^-- EXTERNAL_LIBS=(.*)$/\1/p')
+# avoid *-NOTFOUND to be displayed:
+ARMA_LIBS=$(echo "$ARMA_LIBS" | sed -e 's/[^ ]*-NOTFOUND[^ ]*//g')
 echo "${ARMA_LIBS}"
-rm -fr "${TMPDIR}"
+rm -fr "${TMPDIR}"