[BUG FIX] Install: generating crossed cmake/pc files. (#219)

* TravisCI: fix ILP64 job. No need for security.debian.org.

* [BUG FIX] Install: generating crossed cmake/pc files.
Add cmake/autotool variables in autotool/cmake to generate pc/cmake files.
This commit is contained in:
Franck HOUSSEN
2019-07-08 13:10:20 +02:00
committed by Sylvestre Ledru
parent c43cb86854
commit c0725738d7
3 changed files with 5 additions and 0 deletions
+1
View File
@@ -193,6 +193,7 @@ jobs:
cat /etc/apt/sources.list && \
sed -e 's/stretch/testing/' -i /etc/apt/sources.list && \
sed -e 's/main/main non-free contrib/' -i /etc/apt/sources.list && \
sed -e '/security.debian.org/d' -i /etc/apt/sources.list && \
cat /etc/apt/sources.list && \
export DEBIAN_FRONTEND=noninteractive && \
apt-get -y update && \
+1
View File
@@ -650,6 +650,7 @@ set(PACKAGE_VERSION ${arpack_ng_VERSION})
set(PACKAGE_URL "https://github.com/opencollab/arpack-ng/")
set(LAPACK_LIBS ${LAPACK_LIBRARIES})
set(BLAS_LIBS ${BLAS_LIBRARIES})
set(EIGEN3_CFLAGS ${EIGEN3_INCLUDE_DIR})
configure_file(arpack.pc.in arpack${LIBSUFFIX}.pc @ONLY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/arpack${LIBSUFFIX}.pc
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+3
View File
@@ -240,6 +240,9 @@ m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], [AC_SUBST([pkgconfigdir], [${libdir
AC_CONFIG_FILES([arpack$LIBSUFFIX.pc:arpack.pc.in], [], [LIBSUFFIX="$LIBSUFFIX"])
AC_SUBST([CMAKE_INSTALL_PREFIX], ["$prefix"])
AC_SUBST([BLAS_LIBRARIES], ["$BLAS_LIBS"])
AC_SUBST([LAPACK_LIBRARIES], ["$LAPACK_LIBS"])
AC_SUBST([EIGEN3_INCLUDE_DIR], ["$EIGEN3_CFLAGS"])
AC_CONFIG_FILES([arpack-ng-config.cmake:arpack-ng-config.cmake.in], [], [])
AC_SUBST([arpack_ng_VERSION], ["$VERSION"])