tjh.dev
1--- a/CMakeLists.txt
2+++ b/CMakeLists.txt
3@@ -1,6 +1,6 @@
4 project(Eigen3)
5
6-cmake_minimum_required(VERSION 2.8.5)
7+cmake_minimum_required(VERSION 3.7)
8
9 # guard against in-source builds
10
11@@ -408,13 +408,6 @@ install(FILES
12 DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
13 )
14
15-if(EIGEN_BUILD_PKGCONFIG)
16- configure_file(eigen3.pc.in eigen3.pc @ONLY)
17- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc
18- DESTINATION ${PKGCONFIG_INSTALL_DIR}
19- )
20-endif()
21-
22 add_subdirectory(Eigen)
23
24 add_subdirectory(doc EXCLUDE_FROM_ALL)
25@@ -510,8 +503,15 @@ set ( EIGEN_VERSION_MAJOR ${EIGEN_WORLD_VERSION} )
26 set ( EIGEN_VERSION_MINOR ${EIGEN_MAJOR_VERSION} )
27 set ( EIGEN_VERSION_PATCH ${EIGEN_MINOR_VERSION} )
28 set ( EIGEN_DEFINITIONS "")
29-set ( EIGEN_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}" )
30 set ( EIGEN_ROOT_DIR ${CMAKE_INSTALL_PREFIX} )
31+GNUInstallDirs_get_absolute_install_dir(EIGEN_INCLUDE_DIR INCLUDE_INSTALL_DIR)
32+
33+if(EIGEN_BUILD_PKGCONFIG)
34+ configure_file(eigen3.pc.in eigen3.pc @ONLY)
35+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc
36+ DESTINATION ${PKGCONFIG_INSTALL_DIR}
37+ )
38+endif()
39
40 # Interface libraries require at least CMake 3.0
41 if (NOT CMAKE_VERSION VERSION_LESS 3.0)
42--- a/eigen3.pc.in
43+++ b/eigen3.pc.in
44@@ -6,4 +6,4 @@ Description: A C++ template library for linear algebra: vectors, matrices, and r
45 Requires:
46 Version: @EIGEN_VERSION_NUMBER@
47 Libs:
48-Cflags: -I${prefix}/@INCLUDE_INSTALL_DIR@
49+Cflags: -I@EIGEN_INCLUDE_DIR@