at 22.05-pre 1.6 kB view raw
1diff --git a/CMakeLists.txt b/CMakeLists.txt 2index 28103856e..a36909c0e 100644 3--- a/CMakeLists.txt 4+++ b/CMakeLists.txt 5@@ -449,13 +449,6 @@ install(FILES 6 DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel 7 ) 8 9-if(EIGEN_BUILD_PKGCONFIG) 10- configure_file(eigen3.pc.in eigen3.pc @ONLY) 11- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc 12- DESTINATION ${PKGCONFIG_INSTALL_DIR} 13- ) 14-endif() 15- 16 install(DIRECTORY Eigen DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) 17 18 add_subdirectory(doc EXCLUDE_FROM_ALL) 19@@ -570,8 +563,15 @@ set ( EIGEN_VERSION_MAJOR ${EIGEN_WORLD_VERSION} ) 20 set ( EIGEN_VERSION_MINOR ${EIGEN_MAJOR_VERSION} ) 21 set ( EIGEN_VERSION_PATCH ${EIGEN_MINOR_VERSION} ) 22 set ( EIGEN_DEFINITIONS "") 23-set ( EIGEN_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}" ) 24 set ( EIGEN_ROOT_DIR ${CMAKE_INSTALL_PREFIX} ) 25+GNUInstallDirs_get_absolute_install_dir(EIGEN_INCLUDE_DIR INCLUDE_INSTALL_DIR) 26+ 27+if(EIGEN_BUILD_PKGCONFIG) 28+ configure_file(eigen3.pc.in eigen3.pc @ONLY) 29+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc 30+ DESTINATION ${PKGCONFIG_INSTALL_DIR} 31+ ) 32+endif() 33 34 # Interface libraries require at least CMake 3.0 35 if (NOT CMAKE_VERSION VERSION_LESS 3.0) 36diff --git a/eigen3.pc.in b/eigen3.pc.in 37index 3368a3aa1..d6778bf06 100644 38--- a/eigen3.pc.in 39+++ b/eigen3.pc.in 40@@ -6,4 +6,4 @@ Description: A C++ template library for linear algebra: vectors, matrices, and r 41 Requires: 42 Version: @EIGEN_VERSION_NUMBER@ 43 Libs: 44-Cflags: -I${prefix}/@INCLUDE_INSTALL_DIR@ 45+Cflags: -I@EIGEN_INCLUDE_DIR@