From 5eafea4328f1631eab28b1a20e757d1f0e21f8a6 Mon Sep 17 00:00:00 2001 From: Franck HOUSSEN Date: Sat, 4 Jun 2022 10:54:05 +0200 Subject: [PATCH] Create one .cmake file per arpack-ng flavor (32-bits, 64-bits, ILP64). (#362) --- CHANGES | 1 + CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 3e8953b..fc6b7e8 100644 --- a/CHANGES +++ b/CHANGES @@ -14,6 +14,7 @@ arpack-ng - 3.9.0 * Support for NAG's nagfor Fortran compiler [ Franck Houssen ] +* Create one .cmake file per arpack-ng flavor (32-bits, 64-bits, ILP64). * Test autotools pkg-config (*.pc files) with/without LIBSUFFIX/ITF64SUFFIX. * Test CMake find_package (*.cmake files) with/without LIBSUFFIX/ITF64SUFFIX. * [BUG FIX] autotools: ICB must be checked first (MPI changes compilers). diff --git a/CMakeLists.txt b/CMakeLists.txt index 257c41d..76bcda2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -807,9 +807,9 @@ install(FILES "${PROJECT_BINARY_DIR}/arpackicb.h" DESTINATION ${ARPACK_INSTALL_I # Provide find_package for arpack-ng to users. configure_file(cmake/arpackng-config.cmake.in "${PROJECT_BINARY_DIR}/arpackng-config.cmake" @ONLY) -install(FILES "${PROJECT_BINARY_DIR}/arpackng-config.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/arpack-ng) # find_package(arpackng) +install(FILES "${PROJECT_BINARY_DIR}/arpackng-config.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/arpack-ng${LIBSUFFIX}${ITF64SUFFIX}) # find_package(arpackng) configure_file(cmake/arpackng-config-version.cmake.in "${PROJECT_BINARY_DIR}/arpackng-config-version.cmake" @ONLY) -install(FILES "${PROJECT_BINARY_DIR}/arpackng-config-version.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/arpack-ng) +install(FILES "${PROJECT_BINARY_DIR}/arpackng-config-version.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/arpack-ng${LIBSUFFIX}${ITF64SUFFIX}) configure_file(cmake/tstCMakeInstall.sh.in ${PROJECT_BINARY_DIR}/tstCMakeInstall.sh @ONLY)