From 6173eb67ffcc9235589d5eb1c829c7ec90975d5f Mon Sep 17 00:00:00 2001 From: Benoit Jacob Date: Sat, 24 Oct 2009 16:16:48 -0400 Subject: [PATCH] really fix pkgconfig support and make install. * mistake: was using the install dir instead of binary dir * was also using INCLUDE_INSTALL_DIR before it was set, so on a first cmake run, the pkgconfig file was bad --- CMakeLists.txt | 10 ++++++++-- Eigen/CMakeLists.txt | 6 ------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a93c5223..de008e729 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,12 @@ project(Eigen) cmake_minimum_required(VERSION 2.6.2) +set(INCLUDE_INSTALL_DIR + "${CMAKE_INSTALL_PREFIX}/include/eigen2" + CACHE PATH + "The directory where we install the header files" + FORCE) + set(EIGEN_VERSION_NUMBER "2.0.8") set(EIGEN_VERSION "${EIGEN_VERSION_NUMBER}") @@ -80,8 +86,8 @@ endif(EIGEN_TEST_NO_EXPLICIT_VECTORIZATION) include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) if(EIGEN_BUILD_PKGCONFIG) - configure_file(eigen2.pc.in eigen2.pc) - install(FILES ${CMAKE_INSTALL_PREFIX}/eigen2.pc + configure_file(eigen2.pc.in eigen2.pc) # uses INCLUDE_INSTALL_DIR + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen2.pc DESTINATION lib/pkgconfig ) endif(EIGEN_BUILD_PKGCONFIG) diff --git a/Eigen/CMakeLists.txt b/Eigen/CMakeLists.txt index 64db1ae43..cba3025f7 100644 --- a/Eigen/CMakeLists.txt +++ b/Eigen/CMakeLists.txt @@ -22,12 +22,6 @@ if(CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g1 -O2") endif(CMAKE_COMPILER_IS_GNUCXX) -set(INCLUDE_INSTALL_DIR - "${CMAKE_INSTALL_PREFIX}/include/eigen2" - CACHE PATH - "The directory where we install the header files" - FORCE) - install(FILES ${Eigen_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/Eigen