Merge pull request #1473 from fspindle/feat_catch2

Introduce catch2 3.7.1

.vscode/settings.json

@@ -169,7 +169,8 @@
     "source_location": "cpp",
     "stdfloat": "cpp",
     "text_encoding": "cpp",
-    "print": "cpp"
+    "print": "cpp",
+    "geometry": "cpp"
   },
   "C_Cpp.vcFormat.indent.namespaceContents": false,
   "editor.formatOnSave": true,

3rdparty/catch2/CMakeLists.txt

@@ -1,6 +1,43 @@
 project(${CATCH2_LIBRARY})
 
-set(CATCH2_MAJOR_VERSION 2 PARENT_SCOPE)
-set(CATCH2_MINOR_VERSION 13 PARENT_SCOPE)
-set(CATCH2_PATCH_VERSION 7 PARENT_SCOPE)
+set(CATCH2_MAJOR_VERSION 3 PARENT_SCOPE)
+set(CATCH2_MINOR_VERSION 7 PARENT_SCOPE)
+set(CATCH2_PATCH_VERSION 1 PARENT_SCOPE)
 
+vp_include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+file(GLOB lib_srcs *.cpp)
+file(GLOB lib_hdrs *.hpp)
+
+add_library(${CATCH2_LIBRARY} STATIC ${lib_srcs} ${lib_hdrs})
+target_compile_definitions(${CATCH2_LIBRARY} PRIVATE "CATCH_AMALGAMATED_CUSTOM_MAIN")
+
+if(UNIX)
+  if(CMAKE_COMPILER_IS_GNUCXX OR CV_ICC)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+  endif()
+endif()
+
+if((VISP_CXX_STANDARD EQUAL VISP_CXX_STANDARD_11) AND CXX11_CXX_FLAGS)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_CXX_FLAGS}")
+elseif((VISP_CXX_STANDARD EQUAL VISP_CXX_STANDARD_14) AND CXX14_CXX_FLAGS)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX14_CXX_FLAGS}")
+elseif((VISP_CXX_STANDARD EQUAL VISP_CXX_STANDARD_17) AND CXX17_CXX_FLAGS)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX17_CXX_FLAGS}")
+endif()
+
+if(ENABLE_SOLUTION_FOLDERS)
+  set_target_properties(${CATCH2_LIBRARY} PROPERTIES FOLDER "3rdparty")
+endif()
+
+set_target_properties(${CATCH2_LIBRARY}
+  PROPERTIES OUTPUT_NAME ${CATCH2_LIBRARY}
+  DEBUG_POSTFIX "${VISP_DEBUG_POSTFIX}"
+  COMPILE_PDB_NAME ${CATCH2_LIBRARY}
+  COMPILE_PDB_NAME_DEBUG "${CATCH2_LIBRARY}${VISP_DEBUG_POSTFIX}"
+  ARCHIVE_OUTPUT_DIRECTORY ${VISP_3P_LIBRARY_OUTPUT_PATH}
+  )
+
+if(NOT BUILD_SHARED_LIBS)
+  vp_install_target(${CATCH2_LIBRARY} EXPORT VISPModules ARCHIVE DESTINATION ${VISP_3P_LIB_INSTALL_PATH} COMPONENT dev)
+endif()

3rdparty/catch2/README.VISP

@@ -1,7 +1,8 @@
 WHAT IS CATCH2:
 ---------------
 
-Catch2 is a modern, C++-native, header-only, test framework for unit-tests, TDD and BDD - using C++11, C++14, C++17 and later
+Catch2 is a modern, C++-native, header-only, test framework for unit-tests, TDD and BDD - using C++11, C++14, C++17
+and later.
 
 SOURCE CODE:
 ------------
@@ -17,5 +18,5 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 CONTENT:
 --------
 
-The catch.hpp file is a copy of the latest version of the single header that was downloaded from https://github.com/catchorg/Catch2/releases/download/v2.13.7/catch.hpp
-
+The catch_amalgamated.hpp and catch_amalgamated.cpp files are a copy of the latest version of the single header that
+was downloaded from https://github.com/catchorg/Catch2/releases/tag/v3.7.1