From b452d5518bff0dda61c8681c2f2f6e8a0255f38f Mon Sep 17 00:00:00 2001
From: PepMS <jmarti@iri.upc.edu>
Date: Tue, 7 Apr 2020 15:27:04 +0200
Subject: [PATCH] [installation] file restructuration for correct installation
---
CMakeLists.txt | 6 ++++--
include/gnss_utils/gnss_utils.h | 8 ++++++++
include/gnss_utils/navigation.h | 4 +---
include/gnss_utils/observations.h | 5 +----
include/gnss_utils/utils/rcv_position.h | 5 +----
include/gnss_utils/utils/sat_position.h | 5 +----
include/gnss_utils/utils/transformations.h | 5 +----
include/gnss_utils/utils/utils.h | 14 ++++++--------
test/gtest_navigation.cpp | 2 +-
9 files changed, 24 insertions(+), 30 deletions(-)
create mode 100644 include/gnss_utils/gnss_utils.h
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b02773..4877ba3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -125,7 +125,8 @@ SET(HEADERS
include/gnss_utils/navigation.h
include/gnss_utils/tdcp.h
include/gnss_utils/ublox_raw.h
- ${RTKLIB_SRC_DIR}/rtklib.h)
+ include/gnss_utils/gnss_utils.h
+ ${RTKLIB_SRC_DIR}/rtklib.h)
# Eigen #######
FIND_PACKAGE(Eigen3 REQUIRED)
@@ -158,7 +159,8 @@ INSTALL(TARGETS ${PROJECT_NAME}
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib/iri-algorithms
ARCHIVE DESTINATION lib/iri-algorithms)
-INSTALL(FILES ${HEADERS} DESTINATION include/iri-algorithms/gnss_utils)
+INSTALL(DIRECTORY include/gnss_utils DESTINATION include/iri-algorithms)
+INSTALL(FILES ${RTKLIB_SRC_DIR}/rtklib.h DESTINATION include/iri-algorithms/gnss_utils)
INSTALL(FILES Findgnss_utils.cmake DESTINATION ${CMAKE_ROOT}/Modules/)
INSTALL(FILES "${GNSS_UTILS_CONFIG_DIR}/config.h"
DESTINATION include/iri-algorithms/gnss_utils/internal)
diff --git a/include/gnss_utils/gnss_utils.h b/include/gnss_utils/gnss_utils.h
new file mode 100644
index 0000000..4d9f83f
--- /dev/null
+++ b/include/gnss_utils/gnss_utils.h
@@ -0,0 +1,8 @@
+#ifndef INCLUDE_GNSS_UTILS_GNSS_UTILS_H_
+#define INCLUDE_GNSS_UTILS_GNSS_UTILS_H_
+
+extern "C" {
+#include "rtklib.h"
+}
+
+#endif
\ No newline at end of file
diff --git a/include/gnss_utils/navigation.h b/include/gnss_utils/navigation.h
index 2fc13a7..95b3ad0 100644
--- a/include/gnss_utils/navigation.h
+++ b/include/gnss_utils/navigation.h
@@ -5,9 +5,7 @@
#include <iostream>
#include <memory>
-extern "C" {
-#include "rtklib.h"
-}
+#include "gnss_utils/gnss_utils.h"
namespace GnssUtils
{
diff --git a/include/gnss_utils/observations.h b/include/gnss_utils/observations.h
index db14f81..f3a0846 100644
--- a/include/gnss_utils/observations.h
+++ b/include/gnss_utils/observations.h
@@ -7,12 +7,9 @@
#include <memory>
#include <cassert>
+#include "gnss_utils/gnss_utils.h"
#include "gnss_utils/utils/utils.h"
-extern "C" {
-#include "rtklib.h"
-}
-
namespace GnssUtils
{
class Observations;
diff --git a/include/gnss_utils/utils/rcv_position.h b/include/gnss_utils/utils/rcv_position.h
index 77ec4e7..9755c14 100644
--- a/include/gnss_utils/utils/rcv_position.h
+++ b/include/gnss_utils/utils/rcv_position.h
@@ -15,10 +15,7 @@
#include "gnss_utils/observations.h"
#include "gnss_utils/navigation.h"
#include "gnss_utils/utils/transformations.h"
-
-extern "C" {
-#include "rtklib.h"
-}
+#include "gnss_utils/gnss_utils.h"
namespace GnssUtils
{
diff --git a/include/gnss_utils/utils/sat_position.h b/include/gnss_utils/utils/sat_position.h
index 376d406..3e90436 100644
--- a/include/gnss_utils/utils/sat_position.h
+++ b/include/gnss_utils/utils/sat_position.h
@@ -15,10 +15,7 @@
#include "gnss_utils/observations.h"
#include "gnss_utils/navigation.h"
#include "gnss_utils/utils/transformations.h"
-
-extern "C" {
-#include "rtklib.h"
-}
+#include "gnss_utils/gnss_utils.h"
namespace GnssUtils
{
diff --git a/include/gnss_utils/utils/transformations.h b/include/gnss_utils/utils/transformations.h
index ebed329..caa22c4 100644
--- a/include/gnss_utils/utils/transformations.h
+++ b/include/gnss_utils/utils/transformations.h
@@ -11,10 +11,7 @@
#include <eigen3/Eigen/Dense>
#include <eigen3/Eigen/Geometry>
#include <eigen3/Eigen/Sparse>
-
-extern "C" {
-#include "rtklib.h"
-}
+#include "gnss_utils/gnss_utils.h"
namespace GnssUtils
{
diff --git a/include/gnss_utils/utils/utils.h b/include/gnss_utils/utils/utils.h
index ec5be81..38b0fd6 100644
--- a/include/gnss_utils/utils/utils.h
+++ b/include/gnss_utils/utils/utils.h
@@ -5,15 +5,13 @@
#include <iostream>
#include <memory>
#include <string>
+
#include "gnss_utils/internal/config.h"
+#include "gnss_utils/gnss_utils.h"
#define ARRAY_SIZE(arr) sizeof(arr) / sizeof(arr[0])
#define GNSSUTILS_MSG "--GnssUtils--"
-extern "C" {
-#include "rtklib.h"
-}
-
namespace GnssUtils
{
void print(std::string& _msg);
@@ -39,14 +37,14 @@ bool equalArray(const T* array1, const T* array2, const int& size1, const int& s
} // namespace GnssUtils
-//bool equalTime(const gtime_t& time1, const gtime_t& time2);
+// bool equalTime(const gtime_t& time1, const gtime_t& time2);
bool operator==(const gtime_t& time1, const gtime_t& time2);
bool operator!=(const gtime_t& time1, const gtime_t& time2);
-//bool equalObservations(const obsd_t& obs1, const obsd_t& obs2);
+// bool equalObservations(const obsd_t& obs1, const obsd_t& obs2);
bool operator==(const obsd_t& obs1, const obsd_t& obs2);
bool operator!=(const obsd_t& obs1, const obsd_t& obs2);
-//bool equalObservations(const obs_t& obs1, const obs_t& obs2);
+// bool equalObservations(const obs_t& obs1, const obs_t& obs2);
bool operator==(const obs_t& obs1, const obs_t& obs2);
bool operator!=(const obs_t& obs1, const obs_t& obs2);
-#endif // INCLUDE_GNSS_UTILS_UTILS_UTILS_H_
+#endif // INCLUDE_GNSS_UTILS_UTILS_UTILS_H_
diff --git a/test/gtest_navigation.cpp b/test/gtest_navigation.cpp
index 18e8c63..5170cf1 100644
--- a/test/gtest_navigation.cpp
+++ b/test/gtest_navigation.cpp
@@ -1,5 +1,5 @@
#include "gtest/utils_gtest.h"
-#include "gnss_utils/utils/gnss_utils.h"
+#include "gnss_utils/gnss_utils.h"
TEST(NavigationTests, Whatever)
{
--
GitLab