From d1a29c2947e14477ba391c6c402f269de068520e Mon Sep 17 00:00:00 2001 From: Kyle Guinn Date: Sun, 22 Mar 2020 19:39:34 -0500 Subject: [PATCH] Revert "[BUG FIX] fix cmake/pc files: enable linking from outside. (#216)" See discussion in #221. This reverts commit c43cb868546e8f987cf19b3c2613c56be3865ee3. --- CHANGES | 1 - CMakeLists.txt | 8 ++++---- SRC/arpack.pc.in | 3 ++- arpack-ng-config.cmake.in | 4 ++-- configure.ac | 4 +--- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index 75fab0c..83dc3ae 100644 --- a/CHANGES +++ b/CHANGES @@ -20,7 +20,6 @@ arpack-ng - 3.8.0 * [BUG FIX] ICB using rvec/select: rvec/select turned to integer bool should be, but, is not always supported (depend on compiler, options). * extract arpackSolver.hpp from arpakmm.cpp. - * [BUG FIX] fix cmake/pc files: enable linking from outside (add blas, lapack, eigen). * arpackmm: add --slvItrPC option (PC: Jacobi, ILU). * arpackmm: add --slv LLT LDLT (for SPD matrices). * arpackmm: add --simplePrec option (to enable use of s*upd). diff --git a/CMakeLists.txt b/CMakeLists.txt index 087c9f9..8570371 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -686,15 +686,15 @@ set(includedir \${prefix}/${CMAKE_INSTALL_INCLUDEDIR}) set(PACKAGE_NAME ${PROJECT_NAME}) set(PACKAGE_VERSION ${arpack_ng_VERSION}) set(PACKAGE_URL "https://github.com/opencollab/arpack-ng/") -# Convert (LAPACK|BLAS)_LIBRARIES to -l flags, store in ARPACK_PC_LIBS. +# Convert (LAPACK|BLAS)_LIBRARIES to -l flags, store in ARPACK_PC_LIBS_PRIVATE. # LAPACK_LIBRARIES contains transitive deps, no need to parse BLAS_LIBRARIES. -set(ARPACK_PC_LIBS) +set(ARPACK_PC_LIBS_PRIVATE) foreach(lib ${LAPACK_LIBRARIES}) get_filename_component(libname ${lib} NAME) string(REGEX REPLACE "^lib([^.]+).*$" "-l\\1" libname ${libname}) - list(APPEND ARPACK_PC_LIBS "${libname}") + list(APPEND ARPACK_PC_LIBS_PRIVATE "${libname}") endforeach() -string(REPLACE ";" " " ARPACK_PC_LIBS "${ARPACK_PC_LIBS}") +string(REPLACE ";" " " ARPACK_PC_LIBS_PRIVATE "${ARPACK_PC_LIBS_PRIVATE}") configure_file(SRC/arpack.pc.in "${PROJECT_BINARY_DIR}/SRC/arpack${LIBSUFFIX}.pc" @ONLY) diff --git a/SRC/arpack.pc.in b/SRC/arpack.pc.in index 59b4798..a5550ce 100644 --- a/SRC/arpack.pc.in +++ b/SRC/arpack.pc.in @@ -7,5 +7,6 @@ Name: @PACKAGE_NAME@ Description: Collection of Fortran77 subroutines designed to solve large scale eigenvalue problems Version: @PACKAGE_VERSION@ URL: @PACKAGE_URL@ -Libs: -L${libdir} -larpack@LIBSUFFIX@ @ARPACK_PC_LIBS@ +Libs: -L${libdir} -larpack@LIBSUFFIX@ +Libs.private: @ARPACK_PC_LIBS_PRIVATE@ Cflags: -I${includedir}/arpack diff --git a/arpack-ng-config.cmake.in b/arpack-ng-config.cmake.in index afc0eaa..4ed944e 100644 --- a/arpack-ng-config.cmake.in +++ b/arpack-ng-config.cmake.in @@ -15,9 +15,9 @@ # Create local variables. set(arpack_ng_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@/arpack;${MPI_Fortran_INCLUDE_DIRS};${MPI_C_INCLUDE_DIRS};${MPI_CXX_INCLUDE_DIRS}") if(EXISTS "@CMAKE_INSTALL_FULL_LIBDIR@/libarpack.a") - set(arpack_ng_LIBRARIES "@CMAKE_INSTALL_FULL_LIBDIR@/libarpack.a;@LAPACK_LIBRARIES@;@BLAS_LIBRARIES@") + set(arpack_ng_LIBRARIES "@CMAKE_INSTALL_FULL_LIBDIR@/libarpack.a") elseif(EXISTS "@CMAKE_INSTALL_FULL_LIBDIR@/libarpack.so") - set(arpack_ng_LIBRARIES "@CMAKE_INSTALL_FULL_LIBDIR@/libarpack.so;@LAPACK_LIBRARIES@;@BLAS_LIBRARIES@") + set(arpack_ng_LIBRARIES "@CMAKE_INSTALL_FULL_LIBDIR@/libarpack.so") endif() if(EXISTS "@CMAKE_INSTALL_FULL_LIBDIR@/libparpack.a") set(parpack_ng_LIBRARIES "@CMAKE_INSTALL_FULL_LIBDIR@/libparpack.a;${arpack_ng_LIBRARIES};${MPI_Fortran_LIBRARIES};${MPI_C_LIBRARIES};${MPI_CXX_LIBRARIES}") diff --git a/configure.ac b/configure.ac index ae4ae78..1fbab4c 100644 --- a/configure.ac +++ b/configure.ac @@ -254,13 +254,11 @@ AM_CONDITIONAL([ICB], [test x"$enable_icb" != x"no"]) AM_CONDITIONAL([ICBEXMM], [test x"$enable_icb_exmm" != x"no"]) m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], [AC_SUBST([pkgconfigdir], [${libdir}/pkgconfig])]) -AC_SUBST([ARPACK_PC_LIBS], ["$LAPACK_LIBS $BLAS_LIBS"]) +AC_SUBST([ARPACK_PC_LIBS_PRIVATE], ["$LAPACK_LIBS $BLAS_LIBS"]) AC_CONFIG_FILES([SRC/arpack$LIBSUFFIX.pc:SRC/arpack.pc.in], [], [LIBSUFFIX="$LIBSUFFIX"]) AC_SUBST([CMAKE_INSTALL_FULL_LIBDIR], ["$libdir"]) # FIXME: need to recursively expand these AC_SUBST([CMAKE_INSTALL_FULL_INCLUDEDIR], ["$includedir"]) -AC_SUBST([BLAS_LIBRARIES], ["$BLAS_LIBS"]) # FIXME: need a filename, not a -l flag -AC_SUBST([LAPACK_LIBRARIES], ["$LAPACK_LIBS"]) AC_CONFIG_FILES([arpack-ng-config.cmake]) AC_SUBST([arpack_ng_VERSION], ["$VERSION"])