From a3dc49ae392363bb305f3a4b78730b3f816346d9 Mon Sep 17 00:00:00 2001
From: Muhamed <muhamed.husic@htecgroup.com>
Date: Tue, 17 Mar 2026 15:23:58 +0000
Subject: [PATCH 1/2] Add ROCPROF_USE_SYS_YAML_CPP flag for system yaml-cpp

---
 .../rocprofiler-sdk/external/CMakeLists.txt   | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/projects/rocprofiler-sdk/external/CMakeLists.txt b/projects/rocprofiler-sdk/external/CMakeLists.txt
index 5bee3dc032c..ef63ea2a845 100644
--- a/projects/rocprofiler-sdk/external/CMakeLists.txt
+++ b/projects/rocprofiler-sdk/external/CMakeLists.txt
@@ -138,13 +138,29 @@ rocprofiler_checkout_git_submodule(
     REPO_URL https://github.com/jbeder/yaml-cpp.git
     REPO_BRANCH "master")
 
-add_subdirectory(yaml-cpp EXCLUDE_FROM_ALL)
+
+# Prefer system-provided yaml-cpp over vendored one
+option(ROCPROF_USE_SYS_YAML_CPP
+        "Use system-provided yaml-cpp instead of vendored external/yaml-cpp" ON)
+
+    if (ROCPROF_USE_SYS_YAML_CPP)
+        set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ON)
+        find_package(yaml-cpp CONFIG REQUIRED)
+    else()
+        if (NOT TARGET yaml-cpp)
+            add_subdirectory(yaml-cpp EXCLUDE_FROM_ALL)
+        endif()
+    endif()
+
 
 target_link_libraries(rocprofiler-sdk-yaml-cpp
-                      INTERFACE $<BUILD_INTERFACE:yaml-cpp::yaml-cpp>)
+                      INTERFACE yaml-cpp::yaml-cpp)
+
+if (NOT ROCPROF_USE_SYS_YAML_CPP)
 target_include_directories(
     rocprofiler-sdk-yaml-cpp
     INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/external/yaml-cpp/include>)
+endif()
 
 # checkout submodule if not already checked out or clone repo if no .gitmodules file
 rocprofiler_checkout_git_submodule(

From c84ab9e7c63ace634cdd8ef081cedcad43671ab1 Mon Sep 17 00:00:00 2001
From: Muhamed <muhamed.husic@htecgroup.com>
Date: Wed, 18 Mar 2026 11:45:38 +0000
Subject: [PATCH 2/2] Dead code removal

---
 projects/rocprofiler-sdk/external/CMakeLists.txt | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/projects/rocprofiler-sdk/external/CMakeLists.txt b/projects/rocprofiler-sdk/external/CMakeLists.txt
index ef63ea2a845..7c9be234a8a 100644
--- a/projects/rocprofiler-sdk/external/CMakeLists.txt
+++ b/projects/rocprofiler-sdk/external/CMakeLists.txt
@@ -144,12 +144,9 @@ option(ROCPROF_USE_SYS_YAML_CPP
         "Use system-provided yaml-cpp instead of vendored external/yaml-cpp" ON)
 
     if (ROCPROF_USE_SYS_YAML_CPP)
-        set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ON)
         find_package(yaml-cpp CONFIG REQUIRED)
     else()
-        if (NOT TARGET yaml-cpp)
-            add_subdirectory(yaml-cpp EXCLUDE_FROM_ALL)
-        endif()
+        add_subdirectory(yaml-cpp EXCLUDE_FROM_ALL)
     endif()
 
 
@@ -157,9 +154,9 @@ target_link_libraries(rocprofiler-sdk-yaml-cpp
                       INTERFACE yaml-cpp::yaml-cpp)
 
 if (NOT ROCPROF_USE_SYS_YAML_CPP)
-target_include_directories(
-    rocprofiler-sdk-yaml-cpp
-    INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/external/yaml-cpp/include>)
+    target_include_directories(
+        rocprofiler-sdk-yaml-cpp
+        INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/external/yaml-cpp/include>)
 endif()
 
 # checkout submodule if not already checked out or clone repo if no .gitmodules file