From fb038ef8b197aae3996751c2fffd46bb517fe415 Mon Sep 17 00:00:00 2001
From: Niklas Yann Wettengel <niyawe@uni-koblenz.de>
Date: Sun, 26 Feb 2017 23:50:51 +0100
Subject: [PATCH] Eigen3 INCLUDE_DIR fix
---
homer_map_manager/CMakeLists.txt | 5 +++++
homer_mapping/CMakeLists.txt | 5 +++++
homer_nav_libs/CMakeLists.txt | 5 +++++
homer_navigation/CMakeLists.txt | 5 +++++
4 files changed, 20 insertions(+)
diff --git a/homer_map_manager/CMakeLists.txt b/homer_map_manager/CMakeLists.txt
index ce519e8f..4fe8d929 100644
--- a/homer_map_manager/CMakeLists.txt
+++ b/homer_map_manager/CMakeLists.txt
@@ -5,6 +5,11 @@ find_package(catkin REQUIRED COMPONENTS roscpp roslib tf homer_mapnav_msgs homer
find_package( Eigen3 REQUIRED )
+# eigen 3.2 (wily) only provdies EIGEN3_INCLUDE_DIR, not EIGEN3_INCLUDE_DIRS
+if(NOT EIGEN3_INCLUDE_DIRS)
+ set(EIGEN3_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR})
+endif()
+
set(CMAKE_BUILD_TYPE Release)
find_package(OpenMP)
diff --git a/homer_mapping/CMakeLists.txt b/homer_mapping/CMakeLists.txt
index d23e0e2f..032278c5 100644
--- a/homer_mapping/CMakeLists.txt
+++ b/homer_mapping/CMakeLists.txt
@@ -19,6 +19,11 @@ endif()
find_package(tf REQUIRED)
find_package(Eigen3 REQUIRED)
+# eigen 3.2 (wily) only provdies EIGEN3_INCLUDE_DIR, not EIGEN3_INCLUDE_DIRS
+if(NOT EIGEN3_INCLUDE_DIRS)
+ set(EIGEN3_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR})
+endif()
+
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
find_package(Qt5 REQUIRED COMPONENTS Core Widgets)
diff --git a/homer_nav_libs/CMakeLists.txt b/homer_nav_libs/CMakeLists.txt
index f572e169..0b2ae0ab 100644
--- a/homer_nav_libs/CMakeLists.txt
+++ b/homer_nav_libs/CMakeLists.txt
@@ -14,6 +14,11 @@ find_package(catkin REQUIRED COMPONENTS
find_package(Eigen3 REQUIRED)
+# eigen 3.2 (wily) only provdies EIGEN3_INCLUDE_DIR, not EIGEN3_INCLUDE_DIRS
+if(NOT EIGEN3_INCLUDE_DIRS)
+ set(EIGEN3_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR})
+endif()
+
catkin_package(
INCLUDE_DIRS include
LIBRARIES homerExplorer homerMappingMath
diff --git a/homer_navigation/CMakeLists.txt b/homer_navigation/CMakeLists.txt
index f2853865..1adc03d1 100644
--- a/homer_navigation/CMakeLists.txt
+++ b/homer_navigation/CMakeLists.txt
@@ -17,6 +17,11 @@ find_package(catkin REQUIRED COMPONENTS
find_package(Eigen3 REQUIRED)
+# eigen 3.2 (wily) only provdies EIGEN3_INCLUDE_DIR, not EIGEN3_INCLUDE_DIRS
+if(NOT EIGEN3_INCLUDE_DIRS)
+ set(EIGEN3_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR})
+endif()
+
set(CMAKE_BUILD_TYPE Release)
catkin_package(
--
GitLab