[openblas] Fix generating pkg-config file (#12956)

This commit is contained in:
Albert Ziegenhagel 2020-08-20 23:22:14 +02:00 committed by GitHub
parent d48e2bd9d9
commit c3f69d47c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 1 deletions

View File

@ -1,6 +1,6 @@
Source: openblas Source: openblas
Version: 0.3.9 Version: 0.3.9
Port-Version: 2 Port-Version: 3
Homepage: https://github.com/xianyi/OpenBLAS Homepage: https://github.com/xianyi/OpenBLAS
Build-Depends: pthread (linux&osx) Build-Depends: pthread (linux&osx)
Description: OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version. Description: OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.

View File

@ -0,0 +1,19 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c324e224..4b82d767 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -389,11 +389,9 @@ if(NOT NO_LAPACKE)
install (FILES ${CMAKE_BINARY_DIR}/lapacke_mangling.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/openblas${SUFFIX64})
endif()
-include(FindPkgConfig QUIET)
-if(PKG_CONFIG_FOUND)
- configure_file(${PROJECT_SOURCE_DIR}/cmake/openblas.pc.in ${PROJECT_BINARY_DIR}/openblas${SUFFIX64}.pc @ONLY)
- install (FILES ${PROJECT_BINARY_DIR}/openblas${SUFFIX64}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/)
-endif()
+# Install pkg-config files
+configure_file(${PROJECT_SOURCE_DIR}/cmake/openblas.pc.in ${PROJECT_BINARY_DIR}/openblas${SUFFIX64}.pc @ONLY)
+install (FILES ${PROJECT_BINARY_DIR}/openblas${SUFFIX64}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/)
# GNUInstallDirs "DATADIR" wrong here; CMake search path wants "share".

View File

@ -9,6 +9,7 @@ vcpkg_from_github(
fix-space-path.patch fix-space-path.patch
fix-redefinition-function.patch fix-redefinition-function.patch
github_2481.patch github_2481.patch
fix-pkg-config.patch
) )
find_program(GIT NAMES git git.cmd) find_program(GIT NAMES git git.cmd)