Skip to content

Commit

Permalink
Bump cmake min required version to 3.5 and add possibility to launch …
Browse files Browse the repository at this point in the history
…ctest
  • Loading branch information
fspindle committed Sep 6, 2023
1 parent 021d1c2 commit b1ee149
Show file tree
Hide file tree
Showing 18 changed files with 30 additions and 27 deletions.
23 changes: 13 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.5)

project(visp-sample)

Expand All @@ -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
#--------------------------------------------------------------------
Expand All @@ -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)

2 changes: 1 addition & 1 deletion ar/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.5)

project(sample-core)

Expand Down
2 changes: 1 addition & 1 deletion blob/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.5)

project(sample-core)

Expand Down
2 changes: 1 addition & 1 deletion core/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.5)

project(sample-core)

Expand Down
2 changes: 1 addition & 1 deletion detection/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.5)

project(sample-core)

Expand Down
2 changes: 1 addition & 1 deletion gui/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.5)

project(sample-core)

Expand Down
2 changes: 1 addition & 1 deletion io/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.5)

project(sample-core)

Expand Down
2 changes: 1 addition & 1 deletion json/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.5)

project(sample-json)

Expand Down
2 changes: 1 addition & 1 deletion klt/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.5)

project(sample-core)

Expand Down
2 changes: 1 addition & 1 deletion mbt/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.5)

project(sample-core)

Expand Down
2 changes: 1 addition & 1 deletion me/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.5)

project(sample-core)

Expand Down
2 changes: 1 addition & 1 deletion robot/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.5)

project(sample-core)

Expand Down
2 changes: 1 addition & 1 deletion sensor/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.5)

project(sample-core)

Expand Down
2 changes: 1 addition & 1 deletion tt/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.5)

project(sample-core)

Expand Down
2 changes: 1 addition & 1 deletion video/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.5)

project(sample-core)

Expand Down
2 changes: 1 addition & 1 deletion vision/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.5)

project(sample-core)

Expand Down
2 changes: 1 addition & 1 deletion visual_features/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.5)

project(sample-core)

Expand Down
2 changes: 1 addition & 1 deletion vs/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.5)

project(sample-core)

Expand Down

0 comments on commit b1ee149

Please sign in to comment.