refactor: Drop support for yaml-cpp old API

.github/workflows/build-python.yaml

@@ -131,6 +131,7 @@ jobs:
             gcc \
             make \
             libeigen3-dev \
+            libyaml-cpp-dev \
             ninja-build \
             catch \
             libomp-dev \

CMakeLists.txt

@@ -111,7 +111,7 @@ endforeach()
 # initially
 set(EXTERNAL_LIBS "")
 
-# compile local version of gtest and yaml-cpp
+# compile local version of gtest
 add_subdirectory(contrib)
 
 #---------------------------
@@ -215,41 +215,19 @@ endif()
 
 
 #--------------------
-# DEPENDENCY: yaml-cpp (local or system, optional)
+# DEPENDENCY: yaml-cpp
 #--------------------
-option(USE_SYSTEM_YAML_CPP "Use system version of yaml-cpp rather than one packaged with libpointmatcher" FALSE)
-
-if(USE_SYSTEM_YAML_CPP)
-    message(STATUS "Looking for yaml-cpp on system")
-    find_path(yaml-cpp_INCLUDE_DIRS yaml-cpp/yaml.h
-            /usr/local/include
-    )
-    find_library(yaml-cpp_LIBRARIES yaml-cpp PATHS
-            /usr/local/lib
-    )
-    if(yaml-cpp_INCLUDE_DIRS AND yaml-cpp_LIBRARIES)
-            set(yamlcpp_FOUND)
-            message("-- yaml-cpp found, text-based configuration enabled")
-    else()
-            message("-- yaml-cpp not found, text-based configuration and related applications disabled")
-    endif()
-else()
-        include_directories(contrib/yaml-cpp-pm/include)
 
-#note: this is not working....
-        #get_property(yaml-cpp-pm_INCLUDE TARGET yaml-cpp-pm PROPERTY INCLUDE_DIRECTORIES)
-        #include_directories(${yaml-cpp-pm_INCLUDE})
+message(STATUS "Looking for yaml-cpp on system...")
 
-        list(APPEND EXTERNAL_LIBS $<TARGET_FILE:yaml-cpp-pm>)
-        list(APPEND EXTRA_DEPS yaml-cpp-pm)
-        set(yamlcpp_FOUND)
+find_package(yaml-cpp QUIET)
 
-        get_property(yaml-cpp-pm_VERSION TARGET yaml-cpp-pm PROPERTY VERSION)
-        message("-- using built-in yaml-cpp, version ${yaml-cpp-pm_VERSION}")
-        message("   -- text-based configuration enabled")
+if(yaml-cpp_FOUND)
+        message(STATUS "yaml-cpp version ${yaml-cpp_VERSION} found, text-based configuration enabled")
+else()
+        message(STATUS "yaml-cpp not found, text-based configuration and related applications disabled")
 endif()
 
-
 #--------------------
 # DEPENDENCY: rt (optional)
 #--------------------
@@ -390,13 +368,9 @@ else()
 	target_compile_options(pointmatcher PRIVATE /bigobj)
 endif()
 
-if(yaml-cpp_INCLUDE_DIRS AND yaml-cpp_LIBRARIES)
-	target_link_libraries(pointmatcher PRIVATE ${yaml-cpp_LIBRARIES})
-	target_include_directories(pointmatcher PRIVATE ${yaml-cpp_INCLUDE_DIRS})
-else() # embedded version:
-	# This could be enabled if yaml-cpp-pm was in the "export set"
-	#target_link_libraries(pointmatcher PRIVATE yaml-cpp-pm)
-	# For now, let's add yaml-cpp-pm output to EXTERNAL_LIBS
+if(yaml-cpp_FOUND)
+	target_link_libraries(pointmatcher PUBLIC ${YAML_CPP_LIBRARIES})
+	target_include_directories(pointmatcher PUBLIC ${YAML_CPP_INCLUDE_DIR})
 endif()
 
 target_link_libraries(pointmatcher PUBLIC ${Boost_LIBRARIES})
@@ -541,7 +515,7 @@ set(CONF_INCLUDE_DIRS ${INSTALL_INCLUDE_DIR} ${CONF_INCLUDE_DIRS} )
 #FIXME: this will only be applied to installed files. Confirm that we want that.
 # gather all the includes but remove ones in the source tree
 # because we added an include for the local yaml-cpp-pm we should also remove it
-list(REMOVE_ITEM CONF_INCLUDE_DIRS ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/contrib/yaml-cpp-pm/include)
+list(REMOVE_ITEM CONF_INCLUDE_DIRS ${CMAKE_SOURCE_DIR})
 
 # We put the generated file for installation in a different repository (i.e., ./CMakeFiles/)
 configure_file(libpointmatcherConfig.cmake.in

contrib/CMakeLists.txt

@@ -3,8 +3,3 @@
 # GTest
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 add_library(gtest gtest/gtest-all.cc)
-
-# Wrapped yaml-cpp
-if(NOT USE_SYSTEM_YAML_CPP)
-add_subdirectory(yaml-cpp-pm)
-endif()