From fe8a001c812e09fdc4281297958311147baaca1d Mon Sep 17 00:00:00 2001 From: Elazar Gershuni Date: Tue, 1 Apr 2025 23:42:52 +0300 Subject: [PATCH 1/3] Bump yaml-cpp yaml-cpp release 0.8.0 is not yaml-cpp-0.8.0 https://github.com/jbeder/yaml-cpp/tags --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 14f40fa31..45efe0c0b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,7 +73,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") include(ExternalProject) ExternalProject_Add(yaml-cpp GIT_REPOSITORY https://github.com/jbeder/yaml-cpp.git - GIT_TAG "yaml-cpp-0.7.0" + GIT_TAG "0.8.0" GIT_SHALLOW true CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTERNAL_INSTALL_LOCATION} -DYAML_MSVC_SHARED_RT=ON From afee9710c1e2f2c0aa4583a043cce4cdcee62c91 Mon Sep 17 00:00:00 2001 From: Elazar Gershuni Date: Wed, 2 Apr 2025 00:26:58 +0300 Subject: [PATCH 2/3] fix typo Signed-off-by: Elazar Gershuni --- CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 45efe0c0b..0602b40c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,9 +66,6 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") set(Boost_LIBRARY_DIRS ${CMAKE_BINARY_DIR}/packages/boost_filesystem-vc143/lib/native) if (VERIFIER_ENABLE_TESTS) - # MSVC's "std:c++20" option is the current standard that supports all the C++17 - # features we use. However, cmake can't deal with that here, so we set it below. - set(EXTERNAL_INSTALL_LOCATION ${CMAKE_BINARY_DIR}/packages/yaml-cpp) include(ExternalProject) ExternalProject_Add(yaml-cpp @@ -79,6 +76,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") -DYAML_MSVC_SHARED_RT=ON -DYAML_CPP_BUILD_TESTS=OFF -DYAML_CPP_BUILD_TOOLS=OFF + -DCMAKE_POLICY_VERSION_MINIMUM=3.14 ) set(YAML_CPP_LIBRARIES ${EXTERNAL_INSTALL_LOCATION}/lib/yaml-cpp$<$:d>.lib) set(YAML_CPP_INCLUDE_DIR ${EXTERNAL_INSTALL_LOCATION}/include/) From afa1edadf1ff2f3cbaa0c68e54e9b0153278bab9 Mon Sep 17 00:00:00 2001 From: Elazar Gershuni Date: Wed, 2 Apr 2025 00:57:28 +0300 Subject: [PATCH 3/3] YAML_CPP_STATIC_DEFINE Signed-off-by: Elazar Gershuni --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0602b40c3..a6a3eb51a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,6 +131,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") endif () add_library(ebpfverifier ${LIB_SRC}) +target_compile_definitions(ebpfverifier PRIVATE YAML_CPP_STATIC_DEFINE) if (VERIFIER_ENABLE_TESTS) add_executable(check src/main/check.cpp src/main/linux_verifier.cpp)