From c1a369e2c38cbdb7eaaae465b24c84fa6a3e1fbc Mon Sep 17 00:00:00 2001 From: joanvallve <jvallve@iri.upc.edu> Date: Thu, 23 Dec 2021 16:52:53 +0100 Subject: [PATCH] CMakeLists: UPPER_NAME always for config.h --- CMakeLists.txt | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a4e47183..ce42f3a4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,18 +80,11 @@ ENDIF() option(_WOLF_TRACE "Enable wolf tracing macro" ON) -# Does this has any other interest -# but for the examples ? -# yes, for the tests ! -IF(BUILD_DEMOS OR BUILD_TESTS) - set(_WOLF_ROOT_DIR ${CMAKE_SOURCE_DIR}) -ENDIF(BUILD_DEMOS OR BUILD_TESTS) - #CMAKE modules SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake_modules") MESSAGE(STATUS "Cmake modules at: " ${CMAKE_MODULE_PATH}) -#find dependencies +# ============ DEPENDENCIES ============ FIND_PACKAGE(Threads REQUIRED) FIND_PACKAGE(Ceres REQUIRED) FIND_PACKAGE(Eigen3 3.3 REQUIRED) @@ -100,6 +93,8 @@ if(${EIGEN3_VERSION_STRING} VERSION_LESS 3.3) endif() FIND_PACKAGE(YamlCpp REQUIRED) +# ============ config.h ============ +set(_WOLF_ROOT_DIR ${CMAKE_SOURCE_DIR}) # Define the directory where will be the configured config.h SET(WOLF_CONFIG_DIR ${PROJECT_BINARY_DIR}/conf/core/internal) @@ -127,13 +122,13 @@ ELSE (SPDLOG_INCLUDE_DIR) MESSAGE(FATAL_ERROR "Could not find spdlog") ENDIF (SPDLOG_INCLUDE_DIR) -# Includes +# ============ INCLUDES ============ INCLUDE_DIRECTORIES("include") # In this same project INCLUDE_DIRECTORIES(${EIGEN3_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${YAMLCPP_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${CERES_INCLUDE_DIRS}) -#HEADERS +# ============ HEADERS ============ SET(HDRS_CAPTURE include/core/capture/capture_base.h include/core/capture/capture_motion.h @@ -268,7 +263,7 @@ SET(HDRS_YAML include/core/yaml/yaml_conversion.h ) -#SOURCES +# ============ SOURCES ============ SET(SRCS_CAPTURE src/capture/capture_base.cpp src/capture/capture_motion.cpp @@ -364,7 +359,7 @@ SET(SRCS_YAML src/yaml/sensor_pose_yaml.cpp ) -#OPTIONALS +# ============ OPTIONALS ============ IF (Ceres_FOUND) SET(HDRS_CERES_WRAPPER #ceres_wrapper/qr_manager.h -- GitLab