Removing code object static library (#865)

* Removing static library build for codeobj library

* Moving codeobj library to amd_detail

* Formatting

* Formatting

* Adding findDW

* Adding libdw to common samples cmake

samples/code_object_isa_decode/CMakeLists.txt

@@ -25,25 +25,88 @@ foreach(_TYPE DEBUG MINSIZEREL RELEASE RELWITHDEBINFO)
     endif()
 endforeach()
 
-find_package(rocprofiler-sdk REQUIRED)
-find_package(amd_comgr REQUIRED)
+find_package(PkgConfig)
+
+if(PkgConfig_FOUND)
+    set(ENV{PKG_CONFIG_SYSTEM_INCLUDE_PATH} "")
+    pkg_check_modules(DW libdw)
+
+    if(DW_FOUND
+       AND DW_INCLUDE_DIRS
+       AND DW_LIBRARIES)
+        set(libdw_INCLUDE_DIR
+            "${DW_INCLUDE_DIRS}"
+            CACHE FILEPATH "libdw include directory")
+        set(libdw_LIBRARY
+            "${DW_LIBRARIES}"
+            CACHE FILEPATH "libdw libraries")
+    endif()
+endif()
+
+if(NOT libdw_INCLUDE_DIR OR NOT libdw_LIBRARY)
+    find_path(
+        libdw_ROOT_DIR
+        NAMES include/elfutils/libdw.h
+        HINTS ${libdw_ROOT}
+        PATHS ${libdw_ROOT})
+
+    mark_as_advanced(libdw_ROOT_DIR)
+
+    find_path(
+        libdw_INCLUDE_DIR
+        NAMES elfutils/libdw.h
+        HINTS ${libdw_ROOT}
+        PATHS ${libdw_ROOT}
+        PATH_SUFFIXES include)
+
+    find_library(
+        libdw_LIBRARY
+        NAMES dw
+        HINTS ${libdw_ROOT}
+        PATHS ${libdw_ROOT}
+        PATH_SUFFIXES lib lib64)
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(libdw DEFAULT_MSG libdw_LIBRARY libdw_INCLUDE_DIR)
+
+if(libdw_FOUND AND NOT TARGET libdw::libdw)
+    add_library(libdw::libdw INTERFACE IMPORTED)
+    if(TARGET PkgConfig::DW AND DW_FOUND)
+        target_link_libraries(libdw::libdw INTERFACE PkgConfig::DW)
+    else()
+        target_link_libraries(libdw::libdw INTERFACE ${libdw_LIBRARY})
+        target_include_directories(libdw::libdw SYSTEM INTERFACE ${libdw_INCLUDE_DIR})
+    endif()
+endif()
+
+mark_as_advanced(libdw_INCLUDE_DIR libdw_LIBRARY)
+
+find_package(rocprofiler-sdk REQUIRED)
+find_package(
+    amd_comgr
+    REQUIRED
+    CONFIG
+    HINTS
+    ${rocm_version_DIR}
+    ${ROCM_PATH}
+    PATHS
+    ${rocm_version_DIR}
+    ${ROCM_PATH}
+    PATH_SUFFIXES
+    lib/cmake/amd_comgr)
 
-add_library(code-object-isa-decode-client SHARED)
-target_sources(code-object-isa-decode-client PRIVATE client.cpp)
 set_source_files_properties(main.cpp PROPERTIES LANGUAGE HIP)
 set_source_files_properties(main.cpp PROPERTIES COMPILE_FLAGS "-g")
 
-target_link_libraries(
-    code-object-isa-decode-client
-    PRIVATE rocprofiler::samples-common-library rocprofiler-sdk-codeobj
-            rocprofiler::rocprofiler amd_comgr dw)
-
-rocprofiler_samples_get_preload_env(PRELOAD_ENV code-object-isa-decode-client)
-
 add_executable(code-object-isa-decode)
-target_sources(code-object-isa-decode PRIVATE main.cpp)
-target_link_libraries(code-object-isa-decode PRIVATE code-object-isa-decode-client
-                                                     rocprofiler::samples-build-flags)
+target_sources(code-object-isa-decode PRIVATE main.cpp client.cpp)
+target_link_libraries(
+    code-object-isa-decode
+    PRIVATE rocprofiler::samples-common-library rocprofiler::rocprofiler amd_comgr
+            rocprofiler::samples-build-flags)
+
+rocprofiler_samples_get_preload_env(PRELOAD_ENV code-object-isa-decode)
 
 add_test(NAME code-object-isa-decode COMMAND $<TARGET_FILE:code-object-isa-decode>)
 

samples/code_object_isa_decode/client.cpp

@@ -38,7 +38,7 @@
 #include <rocprofiler-sdk/fwd.h>
 #include <rocprofiler-sdk/registration.h>
 #include <rocprofiler-sdk/rocprofiler.h>
-#include <rocprofiler-sdk-codeobj/code_printing.hpp>
+#include <rocprofiler-sdk/amd_detail/rocprofiler-sdk-codeobj/code_printing.hpp>
 
 #include "common/defines.hpp"
 #include "common/filesystem.hpp"