From 764bbda292afd52d710747042ee07bbced0986c0 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel <guilhem.saurel@laas.fr> Date: Mon, 24 Aug 2020 10:23:41 +0200 Subject: [PATCH] [CMake] sync submodule and its use --- CMakeLists.txt | 5 +++-- cmake | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d92f3eaa..f8909fd4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,13 +26,14 @@ INCLUDE(cmake/boost.cmake) # Project definition COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX) PROJECT(${PROJECT_NAME} ${PROJECT_ARGS}) +CHECK_MINIMAL_CXX_STANDARD(11 ENFORCE) INCLUDE(cmake/pthread.cmake) # needs to be included after the CXX definition # Project dependencies ADD_PROJECT_DEPENDENCY(Eigen3 REQUIRED PKG_CONFIG_REQUIRES eigen3) -SET(BOOST_COMPONENTS serialization system unit_test_framework thread) -SEARCH_FOR_BOOST() +ADD_PROJECT_DEPENDENCY(Boost REQUIRED COMPONENTS serialization system thread) +FIND_PACKAGE(Boost REQUIRED COMPONENTS unit_test_framework) SEARCH_FOR_PTHREAD() # Add configuration headers for plug-ins. diff --git a/cmake b/cmake index fb4c22c3..c6e4768f 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit fb4c22c319ec5320f9a85527eb1a4130954846f5 +Subproject commit c6e4768fc40c1da1bdee04354538151b9c898acf -- GitLab