From b1ee14955de2d302ec7256ec0c7099fa162d6776 Mon Sep 17 00:00:00 2001 From: Fabien Spindler Date: Wed, 6 Sep 2023 18:19:01 +0200 Subject: [PATCH] Bump cmake min required version to 3.5 and add possibility to launch ctest --- CMakeLists.txt | 23 +++++++++++++---------- ar/CMakeLists.txt | 2 +- blob/CMakeLists.txt | 2 +- core/CMakeLists.txt | 2 +- detection/CMakeLists.txt | 2 +- gui/CMakeLists.txt | 2 +- io/CMakeLists.txt | 2 +- json/CMakeLists.txt | 2 +- klt/CMakeLists.txt | 2 +- mbt/CMakeLists.txt | 2 +- me/CMakeLists.txt | 2 +- robot/CMakeLists.txt | 2 +- sensor/CMakeLists.txt | 2 +- tt/CMakeLists.txt | 2 +- video/CMakeLists.txt | 2 +- vision/CMakeLists.txt | 2 +- visual_features/CMakeLists.txt | 2 +- vs/CMakeLists.txt | 2 +- 18 files changed, 30 insertions(+), 27 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 52ae660..1fa15c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) project(visp-sample) @@ -9,11 +9,23 @@ if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: None Debug Release" FORCE) endif() +option(BUILD_TESTS "Build tests" ON) + #-------------------------------------------------------------------- # Detect ViSP #-------------------------------------------------------------------- find_package(VISP REQUIRED) +#---------------------------------------------------------------------- +# Enable testing +#---------------------------------------------------------------------- +if(BUILD_TESTS) + enable_testing() + mark_as_advanced(DART_ROOT) + mark_as_advanced(BUILD_TESTING) + include(CTest) +endif() + #-------------------------------------------------------------------- # Propagate in subdirs #-------------------------------------------------------------------- @@ -34,12 +46,3 @@ add_subdirectory(video) add_subdirectory(vision) add_subdirectory(visual_features) add_subdirectory(vs) - -#---------------------------------------------------------------------- -# For Dart server and tests -# We use CDash set through CTestConfig.cmake file -# Dashboards are sent to http://cdash.irisa.fr/CDash/index.php?project=ViSP -#---------------------------------------------------------------------- -enable_testing() -include(Dart) - diff --git a/ar/CMakeLists.txt b/ar/CMakeLists.txt index 549fce8..86b3864 100644 --- a/ar/CMakeLists.txt +++ b/ar/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) project(sample-core) diff --git a/blob/CMakeLists.txt b/blob/CMakeLists.txt index 549fce8..86b3864 100644 --- a/blob/CMakeLists.txt +++ b/blob/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) project(sample-core) diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 549fce8..86b3864 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) project(sample-core) diff --git a/detection/CMakeLists.txt b/detection/CMakeLists.txt index 549fce8..86b3864 100644 --- a/detection/CMakeLists.txt +++ b/detection/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) project(sample-core) diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index 549fce8..86b3864 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) project(sample-core) diff --git a/io/CMakeLists.txt b/io/CMakeLists.txt index 549fce8..86b3864 100644 --- a/io/CMakeLists.txt +++ b/io/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) project(sample-core) diff --git a/json/CMakeLists.txt b/json/CMakeLists.txt index 0fda4dc..24b99d4 100644 --- a/json/CMakeLists.txt +++ b/json/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) project(sample-json) diff --git a/klt/CMakeLists.txt b/klt/CMakeLists.txt index 549fce8..86b3864 100644 --- a/klt/CMakeLists.txt +++ b/klt/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) project(sample-core) diff --git a/mbt/CMakeLists.txt b/mbt/CMakeLists.txt index 549fce8..86b3864 100644 --- a/mbt/CMakeLists.txt +++ b/mbt/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) project(sample-core) diff --git a/me/CMakeLists.txt b/me/CMakeLists.txt index 549fce8..86b3864 100644 --- a/me/CMakeLists.txt +++ b/me/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) project(sample-core) diff --git a/robot/CMakeLists.txt b/robot/CMakeLists.txt index 549fce8..86b3864 100644 --- a/robot/CMakeLists.txt +++ b/robot/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) project(sample-core) diff --git a/sensor/CMakeLists.txt b/sensor/CMakeLists.txt index 549fce8..86b3864 100644 --- a/sensor/CMakeLists.txt +++ b/sensor/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) project(sample-core) diff --git a/tt/CMakeLists.txt b/tt/CMakeLists.txt index 549fce8..86b3864 100644 --- a/tt/CMakeLists.txt +++ b/tt/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) project(sample-core) diff --git a/video/CMakeLists.txt b/video/CMakeLists.txt index 549fce8..86b3864 100644 --- a/video/CMakeLists.txt +++ b/video/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) project(sample-core) diff --git a/vision/CMakeLists.txt b/vision/CMakeLists.txt index 549fce8..86b3864 100644 --- a/vision/CMakeLists.txt +++ b/vision/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) project(sample-core) diff --git a/visual_features/CMakeLists.txt b/visual_features/CMakeLists.txt index 549fce8..86b3864 100644 --- a/visual_features/CMakeLists.txt +++ b/visual_features/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) project(sample-core) diff --git a/vs/CMakeLists.txt b/vs/CMakeLists.txt index 549fce8..86b3864 100644 --- a/vs/CMakeLists.txt +++ b/vs/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) project(sample-core)