From 0e2f2cabcf0d9be173bb535db92cfa200d3ce812 Mon Sep 17 00:00:00 2001
From: Mederic Fourmy <mederic.fourmy@gmail.com>
Date: Wed, 25 May 2022 18:29:19 +0200
Subject: [PATCH] [skip-ci] remove useless ref to spdlog and other minor things
---
CMakeLists.txt | 42 ++++++++++++++++++------------------------
1 file changed, 18 insertions(+), 24 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e33300bc..6f5285f71 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,6 @@
# Pre-requisites about cmake itself
CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
-if(COMMAND cmake_policy)
- cmake_policy(SET CMP0005 NEW)
- cmake_policy(SET CMP0003 NEW)
-endif(COMMAND cmake_policy)
# MAC OSX RPATH
SET(CMAKE_MACOSX_RPATH 1)
@@ -16,7 +12,7 @@ MESSAGE("Starting ${PROJECT_NAME} CMakeLists ...")
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin)
SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib)
-set(INCLUDE_INSTALL_DIR include/iri-algorithms/wolf)
+set(INCLUDE_INSTALL_DIR include/wolf)
set(LIB_INSTALL_DIR lib/)
IF (NOT CMAKE_BUILD_TYPE)
@@ -106,33 +102,33 @@ INCLUDE_DIRECTORIES(BEFORE "include")
# ============ HEADERS ============
SET(HDRS_CAPTURE
- include/gnss/capture/capture_gnss.h
- include/gnss/capture/capture_gnss_fix.h
- include/gnss/capture/capture_gnss_tdcp.h
+ include/${PROJECT_NAME}/capture/capture_gnss.h
+ include/${PROJECT_NAME}/capture/capture_gnss_fix.h
+ include/${PROJECT_NAME}/capture/capture_gnss_tdcp.h
)
SET(HDRS_FACTOR
- include/gnss/factor/factor_gnss_fix_2d.h
- include/gnss/factor/factor_gnss_fix_3d.h
- include/gnss/factor/factor_gnss_pseudo_range.h
- include/gnss/factor/factor_gnss_tdcp.h
- include/gnss/factor/factor_gnss_tdcp_2d.h
- include/gnss/factor/factor_gnss_tdcp_3d.h
+ include/${PROJECT_NAME}/factor/factor_gnss_fix_2d.h
+ include/${PROJECT_NAME}/factor/factor_gnss_fix_3d.h
+ include/${PROJECT_NAME}/factor/factor_gnss_pseudo_range.h
+ include/${PROJECT_NAME}/factor/factor_gnss_tdcp.h
+ include/${PROJECT_NAME}/factor/factor_gnss_tdcp_2d.h
+ include/${PROJECT_NAME}/factor/factor_gnss_tdcp_3d.h
)
SET(HDRS_FEATURE
- include/gnss/feature/feature_gnss_fix.h
- include/gnss/feature/feature_gnss_tdcp.h
- include/gnss/feature/feature_gnss_satellite.h
+ include/${PROJECT_NAME}/feature/feature_gnss_fix.h
+ include/${PROJECT_NAME}/feature/feature_gnss_tdcp.h
+ include/${PROJECT_NAME}/feature/feature_gnss_satellite.h
)
SET(HDRS_PROCESSOR
- include/gnss/processor/processor_gnss_fix.h
- include/gnss/processor/processor_gnss_tdcp.h
- include/gnss/processor/processor_tracker_gnss.h
+ include/${PROJECT_NAME}/processor/processor_gnss_fix.h
+ include/${PROJECT_NAME}/processor/processor_gnss_tdcp.h
+ include/${PROJECT_NAME}/processor/processor_tracker_gnss.h
)
SET(HDRS_SENSOR
- include/gnss/sensor/sensor_gnss.h
+ include/${PROJECT_NAME}/sensor/sensor_gnss.h
)
SET(HDRS_TREE_MANAGER
- include/gnss/tree_manager/tree_manager_sliding_window_tdcp.h
+ include/${PROJECT_NAME}/tree_manager/tree_manager_sliding_window_tdcp.h
)
# ============ SOURCES ============
@@ -233,8 +229,6 @@ INSTALL(FILES ${HDRS_TREE_MANAGER}
INSTALL(FILES "${WOLF_CONFIG_DIR}/config.h"
DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}/internal)
-INSTALL(DIRECTORY ${SPDLOG_INCLUDE_DIRS} DESTINATION "include/iri-algorithms/")
-
export(PACKAGE ${PLUGIN_NAME})
FIND_PACKAGE(Doxygen MODULE)
--
GitLab