diff options
Diffstat (limited to 'math/lapack/patches/patch-CMakeLists.txt')
| -rw-r--r-- | math/lapack/patches/patch-CMakeLists.txt | 108 |
1 files changed, 29 insertions, 79 deletions
diff --git a/math/lapack/patches/patch-CMakeLists.txt b/math/lapack/patches/patch-CMakeLists.txt index 6fa11d49f9c..c14846adc72 100644 --- a/math/lapack/patches/patch-CMakeLists.txt +++ b/math/lapack/patches/patch-CMakeLists.txt @@ -1,24 +1,22 @@ -$NetBSD: patch-CMakeLists.txt,v 1.1 2020/10/12 21:51:57 bacon Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.2 2021/05/12 14:32:51 thor Exp $ Avoid installation of LAPACK CMake and pkg-config files when not installing LAPACK, also allowing explicitly to switch off LAPACK build for BLAS-only packaging. ---- CMakeLists.txt.orig 2020-03-03 15:36:43.155560348 +0100 -+++ CMakeLists.txt 2020-03-03 15:36:34.827560837 +0100 -@@ -112,8 +112,10 @@ +--- CMakeLists.txt.orig 2021-03-25 18:25:15.000000000 +0000 ++++ CMakeLists.txt +@@ -160,6 +160,9 @@ endif() # -------------------------------------------------- --set(LAPACK_INSTALL_EXPORT_NAME lapack-targets) - ++ +if(LAPACK) + -+set(LAPACK_INSTALL_EXPORT_NAME lapack-targets) + set(LAPACK_INSTALL_EXPORT_NAME ${LAPACKLIB}-targets) + macro(lapack_install_library lib) - install(TARGETS ${lib} - EXPORT ${LAPACK_INSTALL_EXPORT_NAME} -@@ -123,6 +125,18 @@ +@@ -171,6 +174,18 @@ macro(lapack_install_library lib) ) endmacro() @@ -37,7 +35,7 @@ packaging. set(PKG_CONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/pkgconfig) # -------------------------------------------------- -@@ -252,6 +266,10 @@ +@@ -301,6 +316,10 @@ endif() option(USE_OPTIMIZED_LAPACK "Whether or not to use an optimized LAPACK library instead of included netlib LAPACK" OFF) @@ -48,7 +46,7 @@ packaging. # -------------------------------------------------- # LAPACK # User did not provide a LAPACK Library but specified to search for one -@@ -293,6 +311,8 @@ +@@ -342,6 +361,8 @@ else() CACHE STRING "Linker flags for shared libs" FORCE) endif() @@ -57,26 +55,26 @@ packaging. if(BUILD_TESTING) add_subdirectory(TESTING) endif() -@@ -374,14 +394,18 @@ - set(ALL_TARGETS ${ALL_TARGETS} blas) +@@ -450,14 +471,18 @@ if(NOT BLAS_FOUND) + set(ALL_TARGETS ${ALL_TARGETS} ${BLASLIB}) endif() +if(LAPACK) if(NOT LATESTLAPACK_FOUND) - set(ALL_TARGETS ${ALL_TARGETS} lapack) + set(ALL_TARGETS ${ALL_TARGETS} ${LAPACKLIB}) + set(BUILD_LAPACK ON) +endif() endif() if(BUILD_TESTING OR LAPACKE_WITH_TMG) - set(ALL_TARGETS ${ALL_TARGETS} tmglib) + set(ALL_TARGETS ${ALL_TARGETS} ${TMGLIB}) endif() +if(LAPACK) # Export lapack targets, not including lapacke, from the # install tree, if any. set(_lapack_config_install_guard_target "") -@@ -395,6 +419,7 @@ +@@ -471,6 +496,7 @@ if(ALL_TARGETS) # lapack-config.cmake to load targets from the install tree. list(GET ALL_TARGETS 0 _lapack_config_install_guard_target) endif() @@ -84,70 +82,22 @@ packaging. # Include cblas in targets exported from the build tree. if(CBLAS) -@@ -406,6 +431,7 @@ - set(ALL_TARGETS ${ALL_TARGETS} lapacke) +@@ -482,6 +508,8 @@ if(LAPACKE) + set(ALL_TARGETS ${ALL_TARGETS} ${LAPACKELIB}) endif() -+if(LAPACK) ++if(BUILD_LAPACK) ++ # Export lapack and lapacke targets from the build tree, if any. set(_lapack_config_build_guard_target "") if(ALL_TARGETS) -@@ -415,32 +441,34 @@ - # for lapack-config.cmake to load targets from the build tree. - list(GET ALL_TARGETS 0 _lapack_config_build_guard_target) - endif() -+endif() - --configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in -- ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY) -- -+if(BUILD_LAPACK) -+ configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in -+ ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY) - --configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY) -+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY) - install(FILES -- ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc -- DESTINATION ${PKG_CONFIG_DIR} -- COMPONENT Development -- ) -+ ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc -+ DESTINATION ${PKG_CONFIG_DIR} -+ COMPONENT Development -+ ) - --configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-install.cmake.in -- ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake @ONLY) -+ configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-install.cmake.in -+ ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake @ONLY) - --include(CMakePackageConfigHelpers) --write_basic_package_version_file( -- ${LAPACK_BINARY_DIR}/lapack-config-version.cmake -- VERSION ${LAPACK_VERSION} -- COMPATIBILITY SameMajorVersion -- ) -+ include(CMakePackageConfigHelpers) -+ write_basic_package_version_file( -+ ${LAPACK_BINARY_DIR}/lapack-config-version.cmake -+ VERSION ${LAPACK_VERSION} -+ COMPATIBILITY SameMajorVersion -+ ) - --install(FILES -- ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake -- ${LAPACK_BINARY_DIR}/lapack-config-version.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapack-${LAPACK_VERSION} -- COMPONENT Development -- ) -- -\ Kein Zeilenumbruch am Dateiende. -+ install(FILES -+ ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake -+ ${LAPACK_BINARY_DIR}/lapack-config-version.cmake -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapack-${LAPACK_VERSION} -+ COMPONENT Development -+ ) -+endif() -+ +@@ -519,6 +547,9 @@ install(FILES + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKLIB}-${LAPACK_VERSION} + COMPONENT Development + ) ++ ++endif() # BUILD_LAPACK ++ + if (LAPACK++) + install( + DIRECTORY "${LAPACK_BINARY_DIR}/lib/" |