Skip to content
Snippets Groups Projects
Commit 4e78cf51 authored by Mederic Fourmy's avatar Mederic Fourmy
Browse files

Merge branch '22-adapt-to-core-cmakelists-txt-refactor' into 'devel'

Resolve "Adapt to core CMakeLists.txt refactor"

Closes #22

See merge request !36
parents a90d683d 0e2f2cab
No related branches found
No related tags found
2 merge requests!39devel->main,!36Resolve "Adapt to core CMakeLists.txt refactor"
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
bin/ bin/
build*/ build*/
lib/ lib/
gnss.found
.vscode .vscode
.vscode/c_cpp_properties.json .vscode/c_cpp_properties.json
/CMakeCache.txt /CMakeCache.txt
......
# Pre-requisites about cmake itself # Pre-requisites about cmake itself
CMAKE_MINIMUM_REQUIRED(VERSION 3.10) 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 # MAC OSX RPATH
SET(CMAKE_MACOSX_RPATH 1) SET(CMAKE_MACOSX_RPATH 1)
...@@ -16,7 +12,7 @@ MESSAGE("Starting ${PROJECT_NAME} CMakeLists ...") ...@@ -16,7 +12,7 @@ MESSAGE("Starting ${PROJECT_NAME} CMakeLists ...")
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin) SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin)
SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib) 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/) set(LIB_INSTALL_DIR lib/)
IF (NOT CMAKE_BUILD_TYPE) IF (NOT CMAKE_BUILD_TYPE)
...@@ -106,33 +102,33 @@ INCLUDE_DIRECTORIES(BEFORE "include") ...@@ -106,33 +102,33 @@ INCLUDE_DIRECTORIES(BEFORE "include")
# ============ HEADERS ============ # ============ HEADERS ============
SET(HDRS_CAPTURE SET(HDRS_CAPTURE
include/gnss/capture/capture_gnss.h include/${PROJECT_NAME}/capture/capture_gnss.h
include/gnss/capture/capture_gnss_fix.h include/${PROJECT_NAME}/capture/capture_gnss_fix.h
include/gnss/capture/capture_gnss_tdcp.h include/${PROJECT_NAME}/capture/capture_gnss_tdcp.h
) )
SET(HDRS_FACTOR SET(HDRS_FACTOR
include/gnss/factor/factor_gnss_fix_2d.h include/${PROJECT_NAME}/factor/factor_gnss_fix_2d.h
include/gnss/factor/factor_gnss_fix_3d.h include/${PROJECT_NAME}/factor/factor_gnss_fix_3d.h
include/gnss/factor/factor_gnss_pseudo_range.h include/${PROJECT_NAME}/factor/factor_gnss_pseudo_range.h
include/gnss/factor/factor_gnss_tdcp.h include/${PROJECT_NAME}/factor/factor_gnss_tdcp.h
include/gnss/factor/factor_gnss_tdcp_2d.h include/${PROJECT_NAME}/factor/factor_gnss_tdcp_2d.h
include/gnss/factor/factor_gnss_tdcp_3d.h include/${PROJECT_NAME}/factor/factor_gnss_tdcp_3d.h
) )
SET(HDRS_FEATURE SET(HDRS_FEATURE
include/gnss/feature/feature_gnss_fix.h include/${PROJECT_NAME}/feature/feature_gnss_fix.h
include/gnss/feature/feature_gnss_tdcp.h include/${PROJECT_NAME}/feature/feature_gnss_tdcp.h
include/gnss/feature/feature_gnss_satellite.h include/${PROJECT_NAME}/feature/feature_gnss_satellite.h
) )
SET(HDRS_PROCESSOR SET(HDRS_PROCESSOR
include/gnss/processor/processor_gnss_fix.h include/${PROJECT_NAME}/processor/processor_gnss_fix.h
include/gnss/processor/processor_gnss_tdcp.h include/${PROJECT_NAME}/processor/processor_gnss_tdcp.h
include/gnss/processor/processor_tracker_gnss.h include/${PROJECT_NAME}/processor/processor_tracker_gnss.h
) )
SET(HDRS_SENSOR SET(HDRS_SENSOR
include/gnss/sensor/sensor_gnss.h include/${PROJECT_NAME}/sensor/sensor_gnss.h
) )
SET(HDRS_TREE_MANAGER 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 ============ # ============ SOURCES ============
...@@ -233,8 +229,6 @@ INSTALL(FILES ${HDRS_TREE_MANAGER} ...@@ -233,8 +229,6 @@ INSTALL(FILES ${HDRS_TREE_MANAGER}
INSTALL(FILES "${WOLF_CONFIG_DIR}/config.h" INSTALL(FILES "${WOLF_CONFIG_DIR}/config.h"
DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}/internal) DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}/internal)
INSTALL(DIRECTORY ${SPDLOG_INCLUDE_DIRS} DESTINATION "include/iri-algorithms/")
export(PACKAGE ${PLUGIN_NAME}) export(PACKAGE ${PLUGIN_NAME})
FIND_PACKAGE(Doxygen MODULE) FIND_PACKAGE(Doxygen MODULE)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment