From 073a7a9d3e9f0a77c6c814c43950d8c8517179d9 Mon Sep 17 00:00:00 2001 From: Joaquim Casals <jcasals@iri.upc.edu> Date: Tue, 21 May 2019 16:15:47 +0200 Subject: [PATCH] Made YamlCpp mandatory. --- CMakeLists.txt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e242f5b0b..878ee4770 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,19 +98,20 @@ FIND_PACKAGE(Threads REQUIRED) FIND_PACKAGE(wolf REQUIRED) +FIND_PACKAGE(YamlCpp REQUIRED) -FIND_PACKAGE(Ceres QUIET) #Ceres is not required -IF(Ceres_FOUND) - MESSAGE("Ceres Library FOUND: Ceres related sources will be built.") -ENDIF(Ceres_FOUND) - -INCLUDE (${PROJECT_SOURCE_DIR}/cmake_modules/FindYamlCpp.cmake) IF(YAMLCPP_FOUND) MESSAGE("yaml-cpp Library FOUND: yaml-cpp related sources will be built.") ELSEIF(YAMLCPP_FOUND) MESSAGE("yaml-cpp Library NOT FOUND!") ENDIF(YAMLCPP_FOUND) +FIND_PACKAGE(Ceres QUIET) #Ceres is not required +IF(Ceres_FOUND) + MESSAGE("Ceres Library FOUND: Ceres related sources will be built.") +ENDIF(Ceres_FOUND) + + FIND_PATH( Suitesparse_INCLUDE_DIRS NAMES SuiteSparse_config.h @@ -146,7 +147,8 @@ include_directories("${PROJECT_BINARY_DIR}/conf") # ============EXAMPLE================== INCLUDE_DIRECTORIES(${EIGEN_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${wolf_INCLUDE_DIRS}) -include_directories(BEFORE "include") +INCLUDE_DIRECTORIES(BEFORE "include") +INCLUDE_DIRECTORIES(${YAMLCPP_INCLUDE_DIR}) IF(Ceres_FOUND) INCLUDE_DIRECTORIES(${CERES_INCLUDE_DIRS}) ENDIF(Ceres_FOUND) -- GitLab