From 0fa06a4e0ba3df88994662d713f6ea24c6e515a5 Mon Sep 17 00:00:00 2001 From: Fabien Spindler Date: Wed, 2 Oct 2024 13:54:42 +0200 Subject: [PATCH] Enable Catch2 3.7.1 usage only with c++14 standard or higher --- CMakeLists.txt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cf99f78bb2..e365699394 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -805,11 +805,6 @@ VP_OPTION(WITH_STBIMAGE "" "" "Use std_image built-in third-party VP_OPTION(WITH_TINYEXR "" "" "Use tinyexr built-in third-party" "" ON) if(VISP_CXX_STANDARD LESS VISP_CXX_STANDARD_11) - if(WITH_CATCH2) - message(WARNING "catch2 3rd party needs at least c++11 standard compiler flag while you have set c++${USE_CXX_STANDARD}. Thus we disable catch2 usage turning WITH_CATCH2=OFF.") - unset(WITH_CATCH2) - set(WITH_CATCH2 OFF CACHE BOOL "Use catch2 built-in library" FORCE) - endif() if(WITH_POLOLU) message(WARNING "pololu 3rd party needs at least c++11 standard compiler flag while you have set c++${USE_CXX_STANDARD}. Thus we disable pololu usage turning WITH_POLOLU=OFF.") unset(WITH_POLOLU) @@ -827,6 +822,14 @@ if(VISP_CXX_STANDARD LESS VISP_CXX_STANDARD_11) endif() endif() +if(VISP_CXX_STANDARD LESS VISP_CXX_STANDARD_14) + if(WITH_CATCH2) + message(WARNING "catch2 3rd party needs at least c++14 standard compiler flag while you have set c++${USE_CXX_STANDARD}. Thus we disable catch2 usage turning WITH_CATCH2=OFF.") + unset(WITH_CATCH2) + set(WITH_CATCH2 OFF CACHE BOOL "Use catch2 built-in library" FORCE) + endif() +endif() + # ---------------------------------------------------------------------------- # Check for specific functions. Should be after cxx standard detection in VISPDetectCXXStandard.cmake and # potential modification depending on pcl, realsense2, libfranka