From fd640842ff75b8ba898df9ad829f9a8170fbdc2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20Sol=C3=A0?= <jsola@iri.upc.edu>
Date: Sun, 13 Dec 2020 13:55:17 +0100
Subject: [PATCH] Find Eigen in cmake file
---
CMakeLists.txt | 6 ++++++
deps/RTKLIB | 2 +-
include/gnss_utils/gnss_utils.h | 2 +-
include/gnss_utils/snapshot.h | 2 +-
include/gnss_utils/utils/rcv_position.h | 6 +++---
include/gnss_utils/utils/satellite.h | 4 ++--
include/gnss_utils/utils/transformations.h | 6 +++---
7 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 92d6c79..7aec78b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,6 +39,12 @@ endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
+FIND_PACKAGE(Eigen3 3.3 REQUIRED)
+IF(Eigen3_FOUND)
+ INCLUDE_DIRECTORIES(${EIGEN3_INCLUDE_DIRS})
+ENDIF(Eigen3_FOUND)
+
+
# Testing
IF(NOT BUILD_TESTS)
OPTION(BUILD_TESTS "Build Unit tests" ON)
diff --git a/deps/RTKLIB b/deps/RTKLIB
index 4ab9a19..0260d91 160000
--- a/deps/RTKLIB
+++ b/deps/RTKLIB
@@ -1 +1 @@
-Subproject commit 4ab9a199ff46b1220fb4fe99b019c8df526e53e9
+Subproject commit 0260d91932df0ca0691842aa99b39acde5d49c45
diff --git a/include/gnss_utils/gnss_utils.h b/include/gnss_utils/gnss_utils.h
index befead7..cf3c80b 100644
--- a/include/gnss_utils/gnss_utils.h
+++ b/include/gnss_utils/gnss_utils.h
@@ -13,7 +13,7 @@ extern "C" {
#include <memory>
#include <cassert>
// eigen
-#include <eigen3/Eigen/Dense>
+#include <Eigen/Dense>
#ifndef RAD2DEG
#define RAD2DEG 180.0 / 3.14159265358979323846
diff --git a/include/gnss_utils/snapshot.h b/include/gnss_utils/snapshot.h
index 732d191..e2ef0ce 100644
--- a/include/gnss_utils/snapshot.h
+++ b/include/gnss_utils/snapshot.h
@@ -7,7 +7,7 @@
#include <memory>
#include <cassert>
-#include <eigen3/Eigen/Dense>
+#include <Eigen/Dense>
#include "gnss_utils/gnss_utils.h"
diff --git a/include/gnss_utils/utils/rcv_position.h b/include/gnss_utils/utils/rcv_position.h
index c726766..c5ced3f 100644
--- a/include/gnss_utils/utils/rcv_position.h
+++ b/include/gnss_utils/utils/rcv_position.h
@@ -8,9 +8,9 @@
#ifndef INCLUDE_GNSS_UTILS_UTILS_RCV_POSITION_H_
#define INCLUDE_GNSS_UTILS_UTILS_RCV_POSITION_H_
-#include <eigen3/Eigen/Dense>
-#include <eigen3/Eigen/Geometry>
-#include <eigen3/Eigen/Sparse>
+#include <Eigen/Dense>
+#include <Eigen/Geometry>
+#include <Eigen/Sparse>
#include "gnss_utils/observations.h"
#include "gnss_utils/navigation.h"
diff --git a/include/gnss_utils/utils/satellite.h b/include/gnss_utils/utils/satellite.h
index 4cfda61..491f331 100644
--- a/include/gnss_utils/utils/satellite.h
+++ b/include/gnss_utils/utils/satellite.h
@@ -8,8 +8,8 @@
#ifndef INCLUDE_GNSS_UTILS_UTILS_SAT_POSITION_H_
#define INCLUDE_GNSS_UTILS_UTILS_SAT_POSITION_H_
-#include <eigen3/Eigen/Dense>
-#include <eigen3/Eigen/Geometry>
+#include <Eigen/Dense>
+#include <Eigen/Geometry>
#include "gnss_utils/gnss_utils.h"
diff --git a/include/gnss_utils/utils/transformations.h b/include/gnss_utils/utils/transformations.h
index 10ddc0a..da3cb6a 100644
--- a/include/gnss_utils/utils/transformations.h
+++ b/include/gnss_utils/utils/transformations.h
@@ -8,9 +8,9 @@
#ifndef INCLUDE_GNSS_UTILS_UTILS_TRANSFORMATIONS_H_
#define INCLUDE_GNSS_UTILS_UTILS_TRANSFORMATIONS_H_
-#include <eigen3/Eigen/Dense>
-#include <eigen3/Eigen/Geometry>
-#include <eigen3/Eigen/Sparse>
+#include <Eigen/Dense>
+#include <Eigen/Geometry>
+#include <Eigen/Sparse>
#include "gnss_utils/gnss_utils.h"
namespace GnssUtils
--
GitLab