Skip to content

Commit c008398

Browse files
committed
Replace last occurrences of include install paths
* Distributions might need to change the header dir * Also change the template paths in the `.pc` files to the idiomatic CMake `GNUInstallDirs` full paths, which are always correct, regardless of whether the user specified relative or absolute paths. This makes the build system somewhat easier and more idiomatic.
1 parent aefe751 commit c008398

7 files changed

Lines changed: 12 additions & 16 deletions

File tree

BLAS/blas.pc.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
prefix=@prefix@
2-
libdir=@libdir@
1+
libdir=@CMAKE_INSTALL_FULL_LIBDIR@
2+
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
33

44
Name: BLAS
55
Description: FORTRAN reference implementation of BLAS Basic Linear Algebra Subprograms

CBLAS/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ endforeach()
2828
endmacro()
2929

3030
append_subdir_files(CBLAS_INCLUDE "include")
31-
install(FILES ${CBLAS_INCLUDE} ${LAPACK_BINARY_DIR}/include/cblas_mangling.h DESTINATION include)
31+
install(FILES ${CBLAS_INCLUDE} ${LAPACK_BINARY_DIR}/include/cblas_mangling.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
3232

3333
# --------------------------------------------------
3434
if(BUILD_TESTING)

CBLAS/cblas.pc.in

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
prefix=@prefix@
2-
libdir=@libdir@
1+
libdir=@CMAKE_INSTALL_FULL_LIBDIR@
2+
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
33

44
Name: CBLAS
55
Description: C Standard Interface to BLAS Basic Linear Algebra Subprograms
66
Version: @LAPACK_VERSION@
77
URL: http://www.netlib.org/blas/#_cblas
88
Libs: -L${libdir} -lcblas
9+
Cflags: -I${includedir}
910
Requires.private: blas

CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,6 @@ macro(lapack_install_library lib)
108108
endmacro()
109109

110110
set(PKG_CONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
111-
set(prefix ${CMAKE_INSTALL_PREFIX})
112-
if(NOT IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR})
113-
set(libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
114-
else()
115-
set(libdir "${CMAKE_INSTALL_LIBDIR}")
116-
endif()
117111

118112
# --------------------------------------------------
119113
# Testing

LAPACKE/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ endif()
6767
target_link_libraries(lapacke PRIVATE ${LAPACK_LIBRARIES})
6868

6969
lapack_install_library(lapacke)
70-
install(FILES ${LAPACKE_INCLUDE} ${LAPACK_BINARY_DIR}/include/lapacke_mangling.h DESTINATION include)
70+
install(FILES ${LAPACKE_INCLUDE} ${LAPACK_BINARY_DIR}/include/lapacke_mangling.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
7171

7272
if(BUILD_TESTING)
7373
add_subdirectory(example)

LAPACKE/lapacke.pc.in

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
prefix=@prefix@
2-
libdir=@libdir@
1+
libdir=@CMAKE_INSTALL_FULL_LIBDIR@
2+
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
33

44
Name: LAPACKE
55
Description: C Standard Interface to LAPACK Linear Algebra PACKage
66
Version: @LAPACK_VERSION@
77
URL: http://www.netlib.org/lapack/#_standard_c_language_apis_for_lapack
88
Libs: -L${libdir} -llapacke
9+
Cflags: -I${includedir}
910
Requires.private: lapack

lapack.pc.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
prefix=@prefix@
2-
libdir=@libdir@
1+
libdir=@CMAKE_INSTALL_FULL_LIBDIR@
2+
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
33

44
Name: LAPACK
55
Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage

0 commit comments

Comments
 (0)