From ae41112d4328f069b11971a98dab00e24617a3b0 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Mon, 13 Jan 2020 12:55:23 +0100
Subject: [PATCH] [CMake] revert cmake-exports for eigen3 & boost
---
CMakeLists.txt | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 508e0b1..eab627d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,10 +24,12 @@ PROJECT(${PROJECT_NAME} ${PROJECT_ARGS})
# jrl-cmakemodules handling of usual modules
INCLUDE(cmake/pthread.cmake)
-add_project_dependency(Eigen3 REQUIRED NO_MODULE)
-add_project_dependency(Boost REQUIRED
- OPTIONAL_COMPONENTS
- serialization system unit_test_framework thread)
+INCLUDE(cmake/boost.cmake)
+
+ADD_REQUIRED_DEPENDENCY(eigen3)
+SET(BOOST_COMPONENTS serialization system unit_test_framework thread)
+SEARCH_FOR_BOOST()
+
# Allows math in mathjax.
SET(DOXYGEN_USE_MATHJAX YES)
@@ -168,8 +170,8 @@ target_include_directories(${PROJECT_NAME}
PUBLIC
$<BUILD_INTERFACE:${CMAKE_BUILD_DIR}/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
- $<BUILD_INTERFACE:${EIGEN3_INCLUDE_DIR}>
- INTERFACE ${EIGEN3_INCLUDE_DIR}
+ $<BUILD_INTERFACE:${EIGEN3_INCLUDE_DIRS}>
+ INTERFACE ${EIGEN3_INCLUDE_DIRS}
$<INSTALL_INTERFACE:include>
)
--
GitLab