Use PARTIAL_SOURCES_INTENDED

Author: Jeffrey Tan

lldb/source/Plugins/Process/CMakeLists.txt

@@ -26,7 +26,12 @@ add_subdirectory(scripted)
 add_subdirectory(gdb-remote)
 add_subdirectory(Utility)
 add_subdirectory(elf-core)
-add_subdirectory(amdgpu-core)
+
+# Only add amdgpu-core if AMDGPU plugin is enabled
+if(LLDB_ENABLE_AMDGPU_PLUGIN)
+  add_subdirectory(amdgpu-core)
+endif()
+
 add_subdirectory(mach-core)
 add_subdirectory(minidump)
 add_subdirectory(FreeBSDKernel)

lldb/source/Plugins/Process/Utility/CMakeLists.txt

@@ -1,10 +1,6 @@
 # TODO: Clean up this directory and its dependencies
 set_property(DIRECTORY PROPERTY LLDB_PLUGIN_KIND ProcessUtility)
 
-# Conditionally find AMD-dbgapi package
-set(amd-dbgapi_DIR "${ROCM_PATH}/lib/cmake/amd-dbgapi" CACHE PATH "Path to amd-dbgapi cmake config")
-find_package(amd-dbgapi QUIET CONFIG)
-
 # Set up source files list
 set(PROCESS_UTILITY_SOURCES
   AuxVector.cpp
@@ -71,8 +67,8 @@ set(PROCESS_UTILITY_SOURCES
   ThreadMemory.cpp
 )
 
-# Conditionally add AMD GPU support if amd-dbgapi is found
-set(LINK_LIBS_LIST
+# Set up link libraries
+set(UTILITY_LINK_LIBS
   lldbBreakpoint
   lldbCore
   lldbDataFormatters
@@ -84,19 +80,28 @@ set(LINK_LIBS_LIST
   lldbValueObject
 )
 
-if(amd-dbgapi_FOUND)
-  message(STATUS "AMD-dbgapi found, enabling AMDGPU support in ProcessUtility")
-  list(APPEND PROCESS_UTILITY_SOURCES RegisterContextAmdGpuImpl.cpp)
-  list(APPEND LINK_LIBS_LIST amd-dbgapi)
+# Conditionally add AMD GPU support if enabled
+if(LLDB_ENABLE_AMDGPU_PLUGIN)
+  if(NOT DEFINED ROCM_PATH)
+    set(ROCM_PATH "/opt/rocm" CACHE PATH "Path to ROCm installation")
+  endif()
+  set(amd-dbgapi_DIR "${ROCM_PATH}/lib/cmake/amd-dbgapi" CACHE PATH "Path to amd-dbgapi cmake config")
+  find_package(amd-dbgapi REQUIRED CONFIG)
   include_directories(${ROCM_PATH}/include)
+  
+  # Add AMD GPU source file to the build
+  list(APPEND PROCESS_UTILITY_SOURCES RegisterContextAmdGpuImpl.cpp)
+  list(APPEND UTILITY_LINK_LIBS amd-dbgapi)
 endif()
 
 add_lldb_library(lldbPluginProcessUtility
   ${PROCESS_UTILITY_SOURCES}
 
+  PARTIAL_SOURCES_INTENDED
+  
   LINK_COMPONENTS
     Support
     TargetParser
   LINK_LIBS
-    ${LINK_LIBS_LIST}
+    ${UTILITY_LINK_LIBS}
   )

lldb/source/Plugins/Process/amdgpu-core/CMakeLists.txt

@@ -1,5 +1,12 @@
 # Find AMD-dbgapi package using the provided CMake config
+# ROCM_PATH should be set via -DROCM_PATH=... when configuring cmake
+if(NOT DEFINED ROCM_PATH)
+  set(ROCM_PATH "/opt/rocm" CACHE PATH "Path to ROCm installation")
+  message(STATUS "ROCM_PATH not set, using default: ${ROCM_PATH}")
+endif()
+
 set(amd-dbgapi_DIR "${ROCM_PATH}/lib/cmake/amd-dbgapi" CACHE PATH "Path to amd-dbgapi cmake config")
+message(STATUS "Looking for amd-dbgapi in: ${amd-dbgapi_DIR}")
 find_package(amd-dbgapi REQUIRED CONFIG)
 
 include_directories(${ROCM_PATH}/include)