Build yaml-filter submodule

And include it to the libopenscap.so.

Author: jan-cerny

CMakeLists.txt

@@ -165,7 +165,6 @@ if(GCRYPT_FOUND OR NSS_FOUND)
 endif()
 
 find_package(Libyaml)
-find_package(Yamlpath)
 
 check_library_exists(rt clock_gettime "" HAVE_CLOCK_GETTIME)
 check_function_exists(posix_memalign HAVE_POSIX_MEMALIGN)
@@ -238,7 +237,7 @@ cmake_dependent_option(OPENSCAP_PROBE_INDEPENDENT_TEXTFILECONTENT "Independent t
 cmake_dependent_option(OPENSCAP_PROBE_INDEPENDENT_TEXTFILECONTENT54 "Independent textfilecontent54 probe" ON "ENABLE_PROBES_INDEPENDENT; NOT WIN32" OFF)
 cmake_dependent_option(OPENSCAP_PROBE_INDEPENDENT_VARIABLE "Independent variable probe" ON "ENABLE_PROBES_INDEPENDENT" OFF)
 cmake_dependent_option(OPENSCAP_PROBE_INDEPENDENT_XMLFILECONTENT "Independent xmlfilecontent probe" ON "ENABLE_PROBES_INDEPENDENT; NOT WIN32" OFF)
-cmake_dependent_option(OPENSCAP_PROBE_INDEPENDENT_YAMLFILECONTENT "Independent yamlfilecontent probe" ON "ENABLE_PROBES_INDEPENDENT; LIBYAML_FOUND; YAMLPATH_FOUND; NOT WIN32" OFF)
+cmake_dependent_option(OPENSCAP_PROBE_INDEPENDENT_YAMLFILECONTENT "Independent yamlfilecontent probe" ON "ENABLE_PROBES_INDEPENDENT; LIBYAML_FOUND; NOT WIN32" OFF)
 
 # UNIX PROBES
 cmake_dependent_option(OPENSCAP_PROBE_UNIX_DNSCACHE "Unix dnscache probe" ON "ENABLE_PROBES_UNIX" OFF)
@@ -531,6 +530,7 @@ include_directories(
 	"src/XCCDF/public/"
 	"src/XCCDF_POLICY/"
 	"src/XCCDF_POLICY/public/"
+	"yaml-filter"
 	${CMAKE_BINARY_DIR} # config.h is generated to build directory
 	${LIBXML2_INCLUDE_DIR}
 )
@@ -553,6 +553,11 @@ function(set_oscap_generic_properties TARGET_OBJECT)
 	target_compile_definitions(${TARGET_OBJECT} PRIVATE OSCAP_BUILD_SHARED)
 endfunction()
 
+if(OPENSCAP_PROBE_INDEPENDENT_YAMLFILECONTENT)
+	add_library(yamlfilter_object OBJECT yaml-filter/yaml-path.c yaml-filter/yaml-path.h)
+	set_oscap_generic_properties(yamlfilter_object)
+endif()
+
 add_subdirectory("compat")
 add_subdirectory("src")
 add_subdirectory("utils")

cmake/FindYamlpath.cmake

@@ -31,7 +31,7 @@ mkdir -p build
 .. Use fresh sources from git repository.
 +
 ----
-$ git clone https://github.com/OpenSCAP/openscap.git
+$ git clone --recurse-submodules https://github.com/OpenSCAP/openscap.git
 $ cd openscap
 ----
 +

docs/developer/developer.adoc

@@ -9,7 +9,7 @@
 
 . Clone a clean `openscap` repository:
 
-   git clone https://github.com/OpenSCAP/openscap.git
+   git clone --recurse-submodules https://github.com/OpenSCAP/openscap.git
 
 . Create `.env` file
 +

release_tools/README.adoc

@@ -101,7 +101,7 @@ make_dist()
 check_abi()
 {
     rpm -q abi-compliance-checker || sudo dnf install abi-compliance-checker
-    test -d openscap-abi-check || git clone [email protected]:OpenSCAP/openscap-abi-check.git
+    test -d openscap-abi-check || git clone --recurse-submodules [email protected]:OpenSCAP/openscap-abi-check.git
     openscap_git_branch=$(git branch | grep '^\* ' | cut -f2 -d' ')
     (
         cd openscap-abi-check

release_tools/release.sh

@@ -31,6 +31,9 @@ set(OBJECTS_TO_LINK_AGAINST
 if (TARGET "compat_object")
 	list(APPEND OBJECTS_TO_LINK_AGAINST $<TARGET_OBJECTS:compat_object>)
 endif()
+if (TARGET "yamlfilter_object")
+	list(APPEND OBJECTS_TO_LINK_AGAINST $<TARGET_OBJECTS:yamlfilter_object>)
+endif()
 if (ENABLE_PROBES)
 	list(APPEND OBJECTS_TO_LINK_AGAINST
 		$<TARGET_OBJECTS:probe_object>
@@ -124,9 +127,6 @@ endif()
 if(LIBYAML_FOUND)
 	target_link_libraries(openscap ${LIBYAML_LIBRARIES})
 endif()
-if(YAMLPATH_FOUND)
-	target_link_libraries(openscap ${YAMLPATH_LIBRARIES})
-endif()
 
 if(WIN32)
 	set(OPENSCAP_INSTALL_DESTINATION ".")