CMake: Consistently name CMake Targets (#1082)

* Change all rocprofiler-X target names to rocprofiler-sdk-X

* Update rocprofiler-sdk-config.cmake

- fix install tree target names
- simplify logic for using find w/ components and find w/o components

* Update rocprofiler-sdk-roctx-config.cmake

- simplify logic for using find w/ components and find w/o components

* Update samples/intercept_table/CMakeLists.txt

- demonstrate/test use of `find_package(rocprofiler-sdk ... COMPONENTS ...)`

[ROCm/rocprofiler-sdk commit: 74facf87a6]

projects/rocprofiler-sdk/source/lib/common/CMakeLists.txt

@@ -23,31 +23,32 @@ set(common_headers
     units.hpp
     utility.hpp)
 
-add_library(rocprofiler-common-library STATIC)
-add_library(rocprofiler-sdk::rocprofiler-common-library ALIAS rocprofiler-common-library)
+add_library(rocprofiler-sdk-common-library STATIC)
+add_library(rocprofiler-sdk::rocprofiler-sdk-common-library ALIAS
+            rocprofiler-sdk-common-library)
 
 add_subdirectory(container)
 add_subdirectory(memory)
 
-target_sources(rocprofiler-common-library PRIVATE ${common_sources} ${common_headers})
-target_include_directories(rocprofiler-common-library
+target_sources(rocprofiler-sdk-common-library PRIVATE ${common_sources} ${common_headers})
+target_include_directories(rocprofiler-sdk-common-library
                            PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/source>)
 
 target_link_libraries(
-    rocprofiler-common-library
-    PUBLIC $<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-headers>
-           $<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-build-flags>
-           $<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-threading>
-           $<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-memcheck>
-           $<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-cxx-filesystem>
-           $<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-glog>
-           $<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-fmt>
-           $<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-yaml-cpp>
-           $<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-dl>
-           $<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-ptl>
-           $<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-atomic>
-           $<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-hsakmt-nolink>
-           $<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-elfio>)
+    rocprofiler-sdk-common-library
+    PUBLIC $<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-sdk-headers>
+           $<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-sdk-build-flags>
+           $<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-sdk-threading>
+           $<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-sdk-memcheck>
+           $<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-sdk-cxx-filesystem>
+           $<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-sdk-glog>
+           $<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-sdk-fmt>
+           $<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-sdk-yaml-cpp>
+           $<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-sdk-dl>
+           $<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-sdk-ptl>
+           $<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-sdk-atomic>
+           $<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-sdk-hsakmt-nolink>
+           $<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-sdk-elfio>)
 
-set_target_properties(rocprofiler-common-library PROPERTIES OUTPUT_NAME
-                                                            rocprofiler-common)
+set_target_properties(rocprofiler-sdk-common-library PROPERTIES OUTPUT_NAME
+                                                                rocprofiler-sdk-common)

projects/rocprofiler-sdk/source/lib/common/container/CMakeLists.txt

@@ -7,5 +7,5 @@ set(containers_headers
 set(containers_sources ring_buffer.cpp record_header_buffer.cpp ring_buffer.cpp
                        small_vector.cpp)
 
-target_sources(rocprofiler-common-library PRIVATE ${containers_sources}
-                                                  ${containers_headers})
+target_sources(rocprofiler-sdk-common-library PRIVATE ${containers_sources}
+                                                      ${containers_headers})

projects/rocprofiler-sdk/source/lib/common/memory/CMakeLists.txt

@@ -4,4 +4,4 @@
 set(memory_headers deleter.hpp pool.hpp pool_allocator.hpp stateless_allocator.hpp)
 set(memory_sources)
 
-target_sources(rocprofiler-common-library PRIVATE ${memory_sources} ${memory_headers})
+target_sources(rocprofiler-sdk-common-library PRIVATE ${memory_sources} ${memory_headers})

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-codeobj/CMakeLists.txt

@@ -28,8 +28,8 @@ target_include_directories(
 
 target_link_libraries(
     rocprofiler-sdk-codeobj
-    INTERFACE rocprofiler-sdk::rocprofiler-amd-comgr rocprofiler-sdk::rocprofiler-dw
-              rocprofiler-sdk::rocprofiler-elf)
+    INTERFACE rocprofiler-sdk::rocprofiler-sdk-amd-comgr
+              rocprofiler-sdk::rocprofiler-sdk-dw rocprofiler-sdk::rocprofiler-sdk-elf)
 
 if(ROCPROFILER_BUILD_TESTS)
     add_subdirectory(tests)

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-codeobj/tests/CMakeLists.txt

@@ -8,11 +8,11 @@ target_sources(codeobj-library-test PRIVATE ${CODEOBJ_LIB_TEST_SOURCES})
 
 target_link_libraries(
     codeobj-library-test
-    PRIVATE rocprofiler-sdk::rocprofiler-static-library
-            rocprofiler-sdk::rocprofiler-glog
-            rocprofiler-sdk::rocprofiler-hsa-runtime
-            rocprofiler-sdk::rocprofiler-hip
-            rocprofiler-sdk::rocprofiler-common-library
+    PRIVATE rocprofiler-sdk::rocprofiler-sdk-static-library
+            rocprofiler-sdk::rocprofiler-sdk-glog
+            rocprofiler-sdk::rocprofiler-sdk-hsa-runtime
+            rocprofiler-sdk::rocprofiler-sdk-hip
+            rocprofiler-sdk::rocprofiler-sdk-common-library
             GTest::gtest
             GTest::gtest_main
             rocprofiler-sdk::rocprofiler-sdk-codeobj)

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-roctx/CMakeLists.txt

@@ -20,10 +20,10 @@ target_include_directories(
 target_link_libraries(
     rocprofiler-sdk-roctx-shared-library
     PRIVATE rocprofiler-register::rocprofiler-register
-            rocprofiler-sdk::rocprofiler-headers
-            rocprofiler-sdk::rocprofiler-build-flags
-            rocprofiler-sdk::rocprofiler-memcheck
-            rocprofiler-sdk::rocprofiler-common-library)
+            rocprofiler-sdk::rocprofiler-sdk-headers
+            rocprofiler-sdk::rocprofiler-sdk-build-flags
+            rocprofiler-sdk::rocprofiler-sdk-memcheck
+            rocprofiler-sdk::rocprofiler-sdk-common-library)
 
 set_target_properties(
     rocprofiler-sdk-roctx-shared-library

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/CMakeLists.txt

@@ -41,14 +41,14 @@ target_sources(rocprofiler-sdk-tool PRIVATE ${TOOL_SOURCES} ${TOOL_HEADERS})
 
 target_link_libraries(
     rocprofiler-sdk-tool
-    PRIVATE rocprofiler-sdk::rocprofiler-shared-library
-            rocprofiler-sdk::rocprofiler-headers
-            rocprofiler-sdk::rocprofiler-build-flags
-            rocprofiler-sdk::rocprofiler-memcheck
-            rocprofiler-sdk::rocprofiler-common-library
-            rocprofiler-sdk::rocprofiler-cereal
-            rocprofiler-sdk::rocprofiler-perfetto
-            rocprofiler-sdk::rocprofiler-otf2)
+    PRIVATE rocprofiler-sdk::rocprofiler-sdk-shared-library
+            rocprofiler-sdk::rocprofiler-sdk-headers
+            rocprofiler-sdk::rocprofiler-sdk-build-flags
+            rocprofiler-sdk::rocprofiler-sdk-memcheck
+            rocprofiler-sdk::rocprofiler-sdk-common-library
+            rocprofiler-sdk::rocprofiler-sdk-cereal
+            rocprofiler-sdk::rocprofiler-sdk-perfetto
+            rocprofiler-sdk::rocprofiler-sdk-otf2)
 
 set_target_properties(
     rocprofiler-sdk-tool

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk-tool/kokkosp/CMakeLists.txt

@@ -13,8 +13,9 @@ target_sources(rocprofiler-sdk-tool-kokkosp PRIVATE ${KOKKOSP_SOURCES} ${KOKKOSP
 target_link_libraries(
     rocprofiler-sdk-tool-kokkosp
     PRIVATE rocprofiler-sdk-roctx::rocprofiler-sdk-roctx-shared-library
-            rocprofiler-sdk::rocprofiler-headers
-            rocprofiler-sdk::rocprofiler-common-library rocprofiler-sdk::rocprofiler-glog)
+            rocprofiler-sdk::rocprofiler-sdk-headers
+            rocprofiler-sdk::rocprofiler-sdk-common-library
+            rocprofiler-sdk::rocprofiler-sdk-glog)
 
 set_target_properties(
     rocprofiler-sdk-tool-kokkosp

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/CMakeLists.txt

@@ -29,11 +29,12 @@ set(ROCPROFILER_LIB_SOURCES
 #
 # ----------------------------------------------------------------------------------------#
 
-add_library(rocprofiler-object-library OBJECT)
-add_library(rocprofiler-sdk::rocprofiler-object-library ALIAS rocprofiler-object-library)
+add_library(rocprofiler-sdk-object-library OBJECT)
+add_library(rocprofiler-sdk::rocprofiler-sdk-object-library ALIAS
+            rocprofiler-sdk-object-library)
 
-target_sources(rocprofiler-object-library PRIVATE ${ROCPROFILER_LIB_SOURCES}
-                                                  ${ROCPROFILER_LIB_HEADERS})
+target_sources(rocprofiler-sdk-object-library PRIVATE ${ROCPROFILER_LIB_SOURCES}
+                                                      ${ROCPROFILER_LIB_HEADERS})
 
 add_subdirectory(hsa)
 add_subdirectory(hip)
@@ -51,21 +52,23 @@ add_subdirectory(rccl)
 add_subdirectory(details)
 
 target_link_libraries(
-    rocprofiler-object-library
-    PUBLIC rocprofiler-sdk::rocprofiler-headers rocprofiler-sdk::rocprofiler-hip-nolink
-           rocprofiler-sdk::rocprofiler-hsa-runtime-nolink
-           rocprofiler-sdk::rocprofiler-rccl-nolink
-    PRIVATE rocprofiler-sdk::rocprofiler-build-flags
-            rocprofiler-sdk::rocprofiler-memcheck
-            rocprofiler-sdk::rocprofiler-common-library
-            rocprofiler-sdk::rocprofiler-amd-comgr
-            rocprofiler-sdk::rocprofiler-hsa-aql
-            rocprofiler-sdk::rocprofiler-drm
-            rocprofiler-sdk::rocprofiler-hsakmt-nolink)
+    rocprofiler-sdk-object-library
+    PUBLIC rocprofiler-sdk::rocprofiler-sdk-headers
+           rocprofiler-sdk::rocprofiler-sdk-hip-nolink
+           rocprofiler-sdk::rocprofiler-sdk-hsa-runtime-nolink
+           rocprofiler-sdk::rocprofiler-sdk-rccl-nolink
+    PRIVATE rocprofiler-sdk::rocprofiler-sdk-build-flags
+            rocprofiler-sdk::rocprofiler-sdk-memcheck
+            rocprofiler-sdk::rocprofiler-sdk-common-library
+            rocprofiler-sdk::rocprofiler-sdk-amd-comgr
+            rocprofiler-sdk::rocprofiler-sdk-hsa-aql
+            rocprofiler-sdk::rocprofiler-sdk-drm
+            rocprofiler-sdk::rocprofiler-sdk-hsakmt-nolink)
 
-target_compile_definitions(rocprofiler-object-library PRIVATE rocprofiler_EXPORTS=1)
+target_compile_definitions(rocprofiler-sdk-object-library PRIVATE rocprofiler_EXPORTS=1)
 
-set_target_properties(rocprofiler-object-library PROPERTIES POSITION_INDEPENDENT_CODE ON)
+set_target_properties(rocprofiler-sdk-object-library PROPERTIES POSITION_INDEPENDENT_CODE
+                                                                ON)
 
 # ----------------------------------------------------------------------------------------#
 #
@@ -73,30 +76,31 @@ set_target_properties(rocprofiler-object-library PROPERTIES POSITION_INDEPENDENT
 #
 # ----------------------------------------------------------------------------------------#
 
-add_library(rocprofiler-shared-library SHARED)
-add_library(rocprofiler-sdk::rocprofiler-shared-library ALIAS rocprofiler-shared-library)
+add_library(rocprofiler-sdk-shared-library SHARED)
+add_library(rocprofiler-sdk::rocprofiler-sdk-shared-library ALIAS
+            rocprofiler-sdk-shared-library)
 
 target_sources(
-    rocprofiler-shared-library
-    PRIVATE $<TARGET_OBJECTS:rocprofiler-sdk::rocprofiler-object-library>
+    rocprofiler-sdk-shared-library
+    PRIVATE $<TARGET_OBJECTS:rocprofiler-sdk::rocprofiler-sdk-object-library>
             shared_library.cpp)
 target_link_libraries(
-    rocprofiler-shared-library
-    INTERFACE rocprofiler-sdk::rocprofiler-headers
-              $<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-hsa-runtime-nolink>
-              $<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-hip-nolink>
-    PRIVATE rocprofiler-sdk::rocprofiler-hsa-runtime-nolink
-            rocprofiler-sdk::rocprofiler-hip-nolink
-            rocprofiler-sdk::rocprofiler-build-flags
-            rocprofiler-sdk::rocprofiler-memcheck
-            rocprofiler-sdk::rocprofiler-common-library
-            rocprofiler-sdk::rocprofiler-cxx-filesystem
-            rocprofiler-sdk::rocprofiler-dl
-            rocprofiler-sdk::rocprofiler-amd-comgr
-            rocprofiler-sdk::rocprofiler-object-library)
+    rocprofiler-sdk-shared-library
+    INTERFACE rocprofiler-sdk::rocprofiler-sdk-headers
+              $<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-sdk-hsa-runtime-nolink>
+              $<BUILD_INTERFACE:rocprofiler-sdk::rocprofiler-sdk-hip-nolink>
+    PRIVATE rocprofiler-sdk::rocprofiler-sdk-hsa-runtime-nolink
+            rocprofiler-sdk::rocprofiler-sdk-hip-nolink
+            rocprofiler-sdk::rocprofiler-sdk-build-flags
+            rocprofiler-sdk::rocprofiler-sdk-memcheck
+            rocprofiler-sdk::rocprofiler-sdk-common-library
+            rocprofiler-sdk::rocprofiler-sdk-cxx-filesystem
+            rocprofiler-sdk::rocprofiler-sdk-dl
+            rocprofiler-sdk::rocprofiler-sdk-amd-comgr
+            rocprofiler-sdk::rocprofiler-sdk-object-library)
 
 set_target_properties(
-    rocprofiler-shared-library
+    rocprofiler-sdk-shared-library
     PROPERTIES OUTPUT_NAME rocprofiler-sdk
                SOVERSION ${PROJECT_VERSION_MAJOR}
                VERSION ${PROJECT_VERSION}
@@ -104,10 +108,10 @@ set_target_properties(
                INSTALL_RPATH "\$ORIGIN"
                DEFINE_SYMBOL rocprofiler_EXPORTS)
 
-add_library(rocprofiler-sdk::rocprofiler-library ALIAS rocprofiler-shared-library)
+add_library(rocprofiler-sdk::rocprofiler-library ALIAS rocprofiler-sdk-shared-library)
 
 install(
-    TARGETS rocprofiler-shared-library
+    TARGETS rocprofiler-sdk-shared-library
     DESTINATION ${CMAKE_INSTALL_LIBDIR}
     COMPONENT core
     EXPORT rocprofiler-sdk-targets)
@@ -118,22 +122,23 @@ install(
 #
 # ----------------------------------------------------------------------------------------#
 
-add_library(rocprofiler-static-library EXCLUDE_FROM_ALL STATIC)
-add_library(rocprofiler-sdk::rocprofiler-static-library ALIAS rocprofiler-static-library)
+add_library(rocprofiler-sdk-static-library EXCLUDE_FROM_ALL STATIC)
+add_library(rocprofiler-sdk::rocprofiler-sdk-static-library ALIAS
+            rocprofiler-sdk-static-library)
 
-target_sources(rocprofiler-static-library
-               PRIVATE $<TARGET_OBJECTS:rocprofiler-sdk::rocprofiler-object-library>)
+target_sources(rocprofiler-sdk-static-library
+               PRIVATE $<TARGET_OBJECTS:rocprofiler-sdk::rocprofiler-sdk-object-library>)
 target_link_libraries(
-    rocprofiler-static-library
-    PUBLIC rocprofiler-sdk::rocprofiler-headers
-           rocprofiler-sdk::rocprofiler-hsa-runtime-nolink
-           rocprofiler-sdk::rocprofiler-hip-nolink
-    PRIVATE rocprofiler-sdk::rocprofiler-common-library
-            rocprofiler-sdk::rocprofiler-object-library)
+    rocprofiler-sdk-static-library
+    PUBLIC rocprofiler-sdk::rocprofiler-sdk-headers
+           rocprofiler-sdk::rocprofiler-sdk-hsa-runtime-nolink
+           rocprofiler-sdk::rocprofiler-sdk-hip-nolink
+    PRIVATE rocprofiler-sdk::rocprofiler-sdk-common-library
+            rocprofiler-sdk::rocprofiler-sdk-object-library)
 
 set_target_properties(
-    rocprofiler-static-library PROPERTIES OUTPUT_NAME rocprofiler-sdk DEFINE_SYMBOL
-                                                                      rocprofiler_EXPORTS)
+    rocprofiler-sdk-static-library PROPERTIES OUTPUT_NAME rocprofiler-sdk
+                                              DEFINE_SYMBOL rocprofiler_EXPORTS)
 
 # ----------------------------------------------------------------------------------------#
 #

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/CMakeLists.txt

@@ -1,8 +1,8 @@
 set(ROCPROFILER_LIB_AQL_SOURCES helpers.cpp packet_construct.cpp)
 set(ROCPROFILER_LIB_AQL_HEADERS helpers.hpp packet_construct.hpp aql_profile_v2.h)
 
-target_sources(rocprofiler-object-library PRIVATE ${ROCPROFILER_LIB_AQL_SOURCES}
-                                                  ${ROCPROFILER_LIB_AQL_HEADERS})
+target_sources(rocprofiler-sdk-object-library PRIVATE ${ROCPROFILER_LIB_AQL_SOURCES}
+                                                      ${ROCPROFILER_LIB_AQL_HEADERS})
 
 if(ROCPROFILER_BUILD_TESTS)
     add_subdirectory(tests)

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/aql/tests/CMakeLists.txt

@@ -11,11 +11,11 @@ target_sources(aql-test PRIVATE ${ROCPROFILER_LIB_AQL_TEST_SOURCES})
 target_link_libraries(
     aql-test
     PRIVATE rocprofiler-sdk::counter-test-constants
-            rocprofiler-sdk::rocprofiler-static-library
-            rocprofiler-sdk::rocprofiler-glog
-            rocprofiler-sdk::rocprofiler-hsa-runtime
-            rocprofiler-sdk::rocprofiler-hip
-            rocprofiler-sdk::rocprofiler-common-library
+            rocprofiler-sdk::rocprofiler-sdk-static-library
+            rocprofiler-sdk::rocprofiler-sdk-glog
+            rocprofiler-sdk::rocprofiler-sdk-hsa-runtime
+            rocprofiler-sdk::rocprofiler-sdk-hip
+            rocprofiler-sdk::rocprofiler-sdk-common-library
             GTest::gtest
             GTest::gtest_main)
 

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/code_object/CMakeLists.txt

@@ -4,8 +4,9 @@
 set(ROCPROFILER_LIB_CODE_OBJECT_SOURCES code_object.cpp)
 set(ROCPROFILER_LIB_CODE_OBJECT_HEADERS code_object.hpp)
 
-target_sources(rocprofiler-object-library PRIVATE ${ROCPROFILER_LIB_CODE_OBJECT_SOURCES}
-                                                  ${ROCPROFILER_LIB_CODE_OBJECT_HEADERS})
+target_sources(
+    rocprofiler-sdk-object-library PRIVATE ${ROCPROFILER_LIB_CODE_OBJECT_SOURCES}
+                                           ${ROCPROFILER_LIB_CODE_OBJECT_HEADERS})
 
 add_subdirectory(hsa)
 add_subdirectory(hip)

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/code_object/hip/CMakeLists.txt

@@ -5,5 +5,5 @@ set(ROCPROFILER_LIB_CODE_OBJECT_HIP_SOURCES)
 set(ROCPROFILER_LIB_CODE_OBJECT_HIP_HEADERS)
 
 target_sources(
-    rocprofiler-object-library PRIVATE ${ROCPROFILER_LIB_CODE_OBJECT_HIP_SOURCES}
-                                       ${ROCPROFILER_LIB_CODE_OBJECT_HIP_HEADERS})
+    rocprofiler-sdk-object-library PRIVATE ${ROCPROFILER_LIB_CODE_OBJECT_HIP_SOURCES}
+                                           ${ROCPROFILER_LIB_CODE_OBJECT_HIP_HEADERS})

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/code_object/hsa/CMakeLists.txt

@@ -5,5 +5,5 @@ set(ROCPROFILER_LIB_CODE_OBJECT_HSA_SOURCES code_object.cpp kernel_symbol.cpp)
 set(ROCPROFILER_LIB_CODE_OBJECT_HSA_HEADERS code_object.hpp kernel_symbol.hpp)
 
 target_sources(
-    rocprofiler-object-library PRIVATE ${ROCPROFILER_LIB_CODE_OBJECT_HSA_SOURCES}
-                                       ${ROCPROFILER_LIB_CODE_OBJECT_HSA_HEADERS})
+    rocprofiler-sdk-object-library PRIVATE ${ROCPROFILER_LIB_CODE_OBJECT_HSA_SOURCES}
+                                           ${ROCPROFILER_LIB_CODE_OBJECT_HSA_HEADERS})

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/context/CMakeLists.txt

@@ -4,5 +4,5 @@
 set(ROCPROFILER_LIB_CONFIG_SOURCES context.cpp correlation_id.cpp domain.cpp)
 set(ROCPROFILER_LIB_CONFIG_HEADERS context.hpp correlation_id.hpp domain.hpp)
 
-target_sources(rocprofiler-object-library PRIVATE ${ROCPROFILER_LIB_CONFIG_SOURCES}
-                                                  ${ROCPROFILER_LIB_CONFIG_HEADERS})
+target_sources(rocprofiler-sdk-object-library PRIVATE ${ROCPROFILER_LIB_CONFIG_SOURCES}
+                                                      ${ROCPROFILER_LIB_CONFIG_HEADERS})

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/CMakeLists.txt

@@ -4,8 +4,8 @@ set(ROCPROFILER_LIB_COUNTERS_SOURCES
 set(ROCPROFILER_LIB_COUNTERS_HEADERS
     metrics.hpp dimensions.hpp evaluate_ast.hpp core.hpp id_decode.hpp
     dispatch_handlers.hpp controller.hpp device_counting.hpp)
-target_sources(rocprofiler-object-library PRIVATE ${ROCPROFILER_LIB_COUNTERS_SOURCES}
-                                                  ${ROCPROFILER_LIB_COUNTERS_HEADERS})
+target_sources(rocprofiler-sdk-object-library PRIVATE ${ROCPROFILER_LIB_COUNTERS_SOURCES}
+                                                      ${ROCPROFILER_LIB_COUNTERS_HEADERS})
 
 add_subdirectory(xml)
 add_subdirectory(parser)

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/parser/CMakeLists.txt

@@ -2,7 +2,7 @@ rocprofiler_deactivate_clang_tidy()
 
 set(expr_parser_sources parser.cpp parser.h scanner.cpp raw_ast.hpp reader.hpp)
 
-add_library(rocprofiler-expr-parser OBJECT)
+add_library(rocprofiler-sdk-expr-parser OBJECT)
 
 if(ROCPROFILER_REGENERATE_COUNTERS_PARSER)
     find_package(FLEX REQUIRED)
@@ -22,7 +22,7 @@ if(ROCPROFILER_REGENERATE_COUNTERS_PARSER)
                                                                   YYDEBUG=1)
 
     add_custom_target(
-        rocprofiler-expr-parser-patch
+        rocprofiler-sdk-expr-parser-patch
         COMMAND
             ${CMAKE_COMMAND} -DPROJECT_SRC_DIR=${PROJECT_SOURCE_DIR}
             -DPROJECT_BLD_DIR=${PROJECT_BINARY_DIR}
@@ -34,17 +34,18 @@ if(ROCPROFILER_REGENERATE_COUNTERS_PARSER)
                 ${CMAKE_CURRENT_BINARY_DIR}/scanner.cpp
         VERBATIM)
 
-    # ensure gets applied when rocprofiler-expr-parser is built
-    add_dependencies(rocprofiler-expr-parser rocprofiler-expr-parser-patch)
+    # ensure gets applied when rocprofiler-sdk-expr-parser is built
+    add_dependencies(rocprofiler-sdk-expr-parser rocprofiler-sdk-expr-parser-patch)
 endif()
 
-target_sources(rocprofiler-expr-parser PRIVATE ${expr_parser_sources})
-target_include_directories(rocprofiler-expr-parser PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-target_compile_definitions(rocprofiler-expr-parser PRIVATE YY_NO_INPUT)
-target_link_libraries(rocprofiler-expr-parser
-                      PRIVATE rocprofiler-sdk::rocprofiler-common-library)
-target_sources(rocprofiler-object-library
-               PUBLIC $<TARGET_OBJECTS:rocprofiler-expr-parser>)
+target_sources(rocprofiler-sdk-expr-parser PRIVATE ${expr_parser_sources})
+target_include_directories(rocprofiler-sdk-expr-parser
+                           PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+target_compile_definitions(rocprofiler-sdk-expr-parser PRIVATE YY_NO_INPUT)
+target_link_libraries(rocprofiler-sdk-expr-parser
+                      PRIVATE rocprofiler-sdk::rocprofiler-sdk-common-library)
+target_sources(rocprofiler-sdk-object-library
+               PUBLIC $<TARGET_OBJECTS:rocprofiler-sdk-expr-parser>)
 
 if(ROCPROFILER_BUILD_TESTS)
     add_subdirectory(tests)

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/parser/tests/CMakeLists.txt

@@ -10,8 +10,9 @@ target_sources(parser-test PRIVATE ${ROCPROFILER_LIB_PARSER_TEST_SOURCES})
 
 target_link_libraries(
     parser-test
-    PRIVATE rocprofiler-sdk::rocprofiler-common-library
-            rocprofiler-sdk::rocprofiler-static-library GTest::gtest GTest::gtest_main)
+    PRIVATE rocprofiler-sdk::rocprofiler-sdk-common-library
+            rocprofiler-sdk::rocprofiler-sdk-static-library GTest::gtest
+            GTest::gtest_main)
 
 gtest_add_tests(
     TARGET parser-test

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/counters/tests/CMakeLists.txt

@@ -50,9 +50,10 @@ target_sources(
 
 target_link_libraries(
     counter_test_constants
-    PRIVATE rocprofiler-sdk::rocprofiler-common-library
-            rocprofiler-sdk::rocprofiler-static-library rocprofiler-sdk::rocprofiler-hip
-            rocprofiler-sdk::rocprofiler-hsa-runtime)
+    PRIVATE rocprofiler-sdk::rocprofiler-sdk-common-library
+            rocprofiler-sdk::rocprofiler-sdk-static-library
+            rocprofiler-sdk::rocprofiler-sdk-hip
+            rocprofiler-sdk::rocprofiler-sdk-hsa-runtime)
 
 set(ROCPROFILER_LIB_COUNTER_TEST_SOURCES
     metrics_test.cpp evaluate_ast_test.cpp dimension.cpp init_order.cpp core.cpp
@@ -69,10 +70,10 @@ add_dependencies(counter-test agent_hasco_targets)
 target_link_libraries(
     counter-test
     PRIVATE rocprofiler-sdk::counter-test-constants
-            rocprofiler-sdk::rocprofiler-hsa-runtime
-            rocprofiler-sdk::rocprofiler-hip
-            rocprofiler-sdk::rocprofiler-common-library
-            rocprofiler-sdk::rocprofiler-static-library
+            rocprofiler-sdk::rocprofiler-sdk-hsa-runtime
+            rocprofiler-sdk::rocprofiler-sdk-hip
+            rocprofiler-sdk::rocprofiler-sdk-common-library
+            rocprofiler-sdk::rocprofiler-sdk-static-library
             GTest::gtest
             GTest::gtest_main)
 

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/details/CMakeLists.txt

@@ -4,5 +4,5 @@
 set(ROCPROFILER_DETAILS_SOURCES)
 set(ROCPROFILER_DETAILS_HEADERS kfd_ioctl.h)
 
-target_sources(rocprofiler-object-library PRIVATE ${ROCPROFILER_DETAILS_SOURCES}
-                                                  ${ROCPROFILER_DETAILS_HEADERS})
+target_sources(rocprofiler-sdk-object-library PRIVATE ${ROCPROFILER_DETAILS_SOURCES}
+                                                      ${ROCPROFILER_DETAILS_HEADERS})

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/CMakeLists.txt

@@ -1,7 +1,7 @@
 set(ROCPROFILER_LIB_HIP_SOURCES abi.cpp hip.cpp)
 set(ROCPROFILER_LIB_HIP_HEADERS defines.hpp hip.hpp utils.hpp)
 
-target_sources(rocprofiler-object-library PRIVATE ${ROCPROFILER_LIB_HIP_SOURCES}
-                                                  ${ROCPROFILER_LIB_HIP_HEADERS})
+target_sources(rocprofiler-sdk-object-library PRIVATE ${ROCPROFILER_LIB_HIP_SOURCES}
+                                                      ${ROCPROFILER_LIB_HIP_HEADERS})
 
 add_subdirectory(details)

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hip/details/CMakeLists.txt

@@ -4,5 +4,6 @@
 set(ROCPROFILER_LIB_HIP_DETAILS_SOURCES)
 set(ROCPROFILER_LIB_HIP_DETAILS_HEADERS format.hpp ostream.hpp)
 
-target_sources(rocprofiler-object-library PRIVATE ${ROCPROFILER_LIB_HIP_DETAILS_SOURCES}
-                                                  ${ROCPROFILER_LIB_HIP_DETAILS_HEADERS})
+target_sources(
+    rocprofiler-sdk-object-library PRIVATE ${ROCPROFILER_LIB_HIP_DETAILS_SOURCES}
+                                           ${ROCPROFILER_LIB_HIP_DETAILS_HEADERS})

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/CMakeLists.txt

@@ -28,7 +28,7 @@ set(ROCPROFILER_LIB_HSA_HEADERS
     scratch_memory.hpp
     utils.hpp)
 
-target_sources(rocprofiler-object-library PRIVATE ${ROCPROFILER_LIB_HSA_SOURCES}
-                                                  ${ROCPROFILER_LIB_HSA_HEADERS})
+target_sources(rocprofiler-sdk-object-library PRIVATE ${ROCPROFILER_LIB_HSA_SOURCES}
+                                                      ${ROCPROFILER_LIB_HSA_HEADERS})
 
 add_subdirectory(details)

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/hsa/details/CMakeLists.txt

@@ -4,5 +4,6 @@
 set(ROCPROFILER_LIB_HSA_DETAILS_SOURCES)
 set(ROCPROFILER_LIB_HSA_DETAILS_HEADERS ostream.hpp fmt.hpp)
 
-target_sources(rocprofiler-object-library PRIVATE ${ROCPROFILER_LIB_HSA_DETAILS_SOURCES}
-                                                  ${ROCPROFILER_LIB_HSA_DETAILS_HEADERS})
+target_sources(
+    rocprofiler-sdk-object-library PRIVATE ${ROCPROFILER_LIB_HSA_DETAILS_SOURCES}
+                                           ${ROCPROFILER_LIB_HSA_DETAILS_HEADERS})

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/kernel_dispatch/CMakeLists.txt

@@ -5,5 +5,5 @@ set(ROCPROFILER_LIB_KERNEL_DISPATCH_HEADERS kernel_dispatch.hpp profiling_time.h
                                             tracing.hpp)
 
 target_sources(
-    rocprofiler-object-library PRIVATE ${ROCPROFILER_LIB_KERNEL_DISPATCH_SOURCES}
-                                       ${ROCPROFILER_LIB_KERNEL_DISPATCH_HEADERS})
+    rocprofiler-sdk-object-library PRIVATE ${ROCPROFILER_LIB_KERNEL_DISPATCH_SOURCES}
+                                           ${ROCPROFILER_LIB_KERNEL_DISPATCH_HEADERS})

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/marker/CMakeLists.txt

@@ -3,5 +3,5 @@
 set(ROCPROFILER_LIB_MARKER_SOURCES marker.cpp)
 set(ROCPROFILER_LIB_MARKER_HEADERS defines.hpp marker.hpp utils.hpp)
 
-target_sources(rocprofiler-object-library PRIVATE ${ROCPROFILER_LIB_MARKER_SOURCES}
-                                                  ${ROCPROFILER_LIB_MARKER_HEADERS})
+target_sources(rocprofiler-sdk-object-library PRIVATE ${ROCPROFILER_LIB_MARKER_SOURCES}
+                                                      ${ROCPROFILER_LIB_MARKER_HEADERS})

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/page_migration/CMakeLists.txt

@@ -3,5 +3,5 @@
 set(ROCPROFILER_LIB_UVM_SOURCES page_migration.cpp)
 set(ROCPROFILER_LIB_UVM_HEADERS defines.hpp page_migration.hpp utils.hpp)
 
-target_sources(rocprofiler-object-library PRIVATE ${ROCPROFILER_LIB_UVM_SOURCES}
-                                                  ${ROCPROFILER_LIB_UVM_HEADERS})
+target_sources(rocprofiler-sdk-object-library PRIVATE ${ROCPROFILER_LIB_UVM_SOURCES}
+                                                      ${ROCPROFILER_LIB_UVM_HEADERS})

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/CMakeLists.txt

@@ -13,8 +13,8 @@ set(ROCPROFILER_PC_SAMPLING_SOURCES hsa_adapter.cpp utils.cpp service.cpp cid_ma
 set(ROCPROFILER_PC_SAMPLING_HEADERS hsa_adapter.hpp utils.hpp service.hpp types.hpp
                                     cid_manager.hpp code_object.hpp)
 
-target_sources(rocprofiler-object-library PRIVATE ${ROCPROFILER_PC_SAMPLING_SOURCES}
-                                                  ${ROCPROFILER_PC_SAMPLING_HEADERS})
+target_sources(rocprofiler-sdk-object-library PRIVATE ${ROCPROFILER_PC_SAMPLING_SOURCES}
+                                                      ${ROCPROFILER_PC_SAMPLING_HEADERS})
 
 add_subdirectory(ioctl)
 

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/ioctl/CMakeLists.txt

@@ -2,5 +2,5 @@ set(ROCPROFILER_PC_SAMPLING_IOCTL_SOURCES ioctl_adapter.cpp)
 set(ROCPROFILER_PC_SAMPLING_IOCTL_HEADERS ioctl_adapter.hpp ioctl_adapter_types.hpp)
 
 target_sources(
-    rocprofiler-object-library PRIVATE ${ROCPROFILER_PC_SAMPLING_IOCTL_SOURCES}
-                                       ${ROCPROFILER_PC_SAMPLING_IOCTL_HEADERS})
+    rocprofiler-sdk-object-library PRIVATE ${ROCPROFILER_PC_SAMPLING_IOCTL_SOURCES}
+                                           ${ROCPROFILER_PC_SAMPLING_IOCTL_HEADERS})

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/CMakeLists.txt

@@ -4,8 +4,8 @@ set(ROCPROFILER_LIB_PC_SAMPLING_PARSER_HEADERS
     translation.hpp)
 
 target_sources(
-    rocprofiler-object-library PRIVATE ${ROCPROFILER_LIB_PC_SAMPLING_PARSER_SOURCES}
-                                       ${ROCPROFILER_LIB_PC_SAMPLING_PARSER_HEADERS})
+    rocprofiler-sdk-object-library PRIVATE ${ROCPROFILER_LIB_PC_SAMPLING_PARSER_SOURCES}
+                                           ${ROCPROFILER_LIB_PC_SAMPLING_PARSER_HEADERS})
 
 if(ROCPROFILER_BUILD_TESTS)
     add_subdirectory(tests)

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/parser/tests/CMakeLists.txt

@@ -18,8 +18,9 @@ target_include_directories(pcs_gfx9_test PRIVATE ${PCTEST_INCLUDE_DIR})
 
 target_link_libraries(
     pcs_gfx9_test
-    PRIVATE rocprofiler-sdk::rocprofiler-common-library
-            rocprofiler-sdk::rocprofiler-static-library GTest::gtest GTest::gtest_main)
+    PRIVATE rocprofiler-sdk::rocprofiler-sdk-common-library
+            rocprofiler-sdk::rocprofiler-sdk-static-library GTest::gtest
+            GTest::gtest_main)
 
 gtest_add_tests(
     TARGET pcs_gfx9_test
@@ -36,8 +37,9 @@ target_include_directories(pcs_id_test PRIVATE ${PCTEST_INCLUDE_DIR})
 
 target_link_libraries(
     pcs_id_test
-    PRIVATE rocprofiler-sdk::rocprofiler-common-library
-            rocprofiler-sdk::rocprofiler-static-library GTest::gtest GTest::gtest_main)
+    PRIVATE rocprofiler-sdk::rocprofiler-sdk-common-library
+            rocprofiler-sdk::rocprofiler-sdk-static-library GTest::gtest
+            GTest::gtest_main)
 
 gtest_add_tests(
     TARGET pcs_id_test
@@ -56,8 +58,9 @@ target_include_directories(pcs_bench_test PRIVATE ${PCTEST_INCLUDE_DIR})
 
 target_link_libraries(
     pcs_bench_test
-    PRIVATE rocprofiler-sdk::rocprofiler-common-library
-            rocprofiler-sdk::rocprofiler-static-library GTest::gtest GTest::gtest_main)
+    PRIVATE rocprofiler-sdk::rocprofiler-sdk-common-library
+            rocprofiler-sdk::rocprofiler-sdk-static-library GTest::gtest
+            GTest::gtest_main)
 
 add_executable(pcs_thread_test)
 target_compile_options(pcs_thread_test PRIVATE "-Ofast")
@@ -67,8 +70,9 @@ target_include_directories(pcs_thread_test PRIVATE ${PCTEST_INCLUDE_DIR})
 
 target_link_libraries(
     pcs_thread_test
-    PRIVATE rocprofiler-sdk::rocprofiler-common-library
-            rocprofiler-sdk::rocprofiler-static-library GTest::gtest GTest::gtest_main)
+    PRIVATE rocprofiler-sdk::rocprofiler-sdk-common-library
+            rocprofiler-sdk::rocprofiler-sdk-static-library GTest::gtest
+            GTest::gtest_main)
 
 gtest_add_tests(
     TARGET pcs_thread_test

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/pc_sampling/tests/CMakeLists.txt

@@ -15,8 +15,9 @@ target_sources(pcs-test PRIVATE ${ROCPROFILER_LIB_PC_SAMPLING_TEST_SOURCES}
 
 target_link_libraries(
     pcs-test
-    PRIVATE rocprofiler-sdk::rocprofiler-common-library
-            rocprofiler-sdk::rocprofiler-static-library GTest::gtest GTest::gtest_main)
+    PRIVATE rocprofiler-sdk::rocprofiler-sdk-common-library
+            rocprofiler-sdk::rocprofiler-sdk-static-library GTest::gtest
+            GTest::gtest_main)
 
 gtest_add_tests(
     TARGET pcs-test

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/rccl/CMakeLists.txt

@@ -1,5 +1,5 @@
 set(ROCPROFILER_LIB_RCCL_SOURCES abi.cpp rccl.cpp)
 set(ROCPROFILER_LIB_RCCL_HEADERS defines.hpp rccl.hpp)
 
-target_sources(rocprofiler-object-library PRIVATE ${ROCPROFILER_LIB_RCCL_SOURCES}
-                                                  ${ROCPROFILER_LIB_RCCL_HEADERS})
+target_sources(rocprofiler-sdk-object-library PRIVATE ${ROCPROFILER_LIB_RCCL_SOURCES}
+                                                      ${ROCPROFILER_LIB_RCCL_HEADERS})

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tests/CMakeLists.txt

@@ -14,19 +14,20 @@ include(GoogleTest)
 set(rocprofiler_lib_sources agent.cpp buffer.cpp contexts.cpp hsa.cpp naming.cpp
                             timestamp.cpp version.cpp hsa_barrier.cpp)
 
-add_executable(rocprofiler-lib-tests)
-target_sources(rocprofiler-lib-tests PRIVATE ${rocprofiler_lib_sources} details/agent.cpp)
+add_executable(rocprofiler-sdk-lib-tests)
+target_sources(rocprofiler-sdk-lib-tests PRIVATE ${rocprofiler_lib_sources}
+                                                 details/agent.cpp)
 target_link_libraries(
-    rocprofiler-lib-tests
-    PRIVATE rocprofiler-sdk::rocprofiler-static-library
-            rocprofiler-sdk::rocprofiler-common-library
+    rocprofiler-sdk-lib-tests
+    PRIVATE rocprofiler-sdk::rocprofiler-sdk-static-library
+            rocprofiler-sdk::rocprofiler-sdk-common-library
             rocprofiler-sdk::counter-test-constants
-            rocprofiler-sdk::rocprofiler-hsa-runtime
+            rocprofiler-sdk::rocprofiler-sdk-hsa-runtime
             GTest::gtest
             GTest::gtest_main)
 
 gtest_add_tests(
-    TARGET rocprofiler-lib-tests
+    TARGET rocprofiler-sdk-lib-tests
     SOURCES ${rocprofiler_lib_sources}
     TEST_LIST lib_TESTS
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
@@ -43,29 +44,29 @@ set(rocprofiler_shared_lib_sources
     external_correlation.cpp intercept_table.cpp page_migration.cpp registration.cpp
     roctx.cpp status.cpp)
 
-add_executable(rocprofiler-lib-tests-shared)
-target_sources(rocprofiler-lib-tests-shared PRIVATE ${rocprofiler_shared_lib_sources})
+add_executable(rocprofiler-sdk-lib-tests-shared)
+target_sources(rocprofiler-sdk-lib-tests-shared PRIVATE ${rocprofiler_shared_lib_sources})
 target_link_libraries(
-    rocprofiler-lib-tests-shared
-    PRIVATE rocprofiler-sdk::rocprofiler-shared-library
-            rocprofiler-sdk::rocprofiler-common-library
-            rocprofiler-sdk::rocprofiler-hsa-runtime
-            rocprofiler-sdk::rocprofiler-drm
+    rocprofiler-sdk-lib-tests-shared
+    PRIVATE rocprofiler-sdk::rocprofiler-sdk-shared-library
+            rocprofiler-sdk::rocprofiler-sdk-common-library
+            rocprofiler-sdk::rocprofiler-sdk-hsa-runtime
+            rocprofiler-sdk::rocprofiler-sdk-drm
             rocprofiler-sdk::rocprofiler-sdk-roctx-shared-library
             GTest::gtest
             GTest::gtest_main)
-set_target_properties(rocprofiler-lib-tests-shared PROPERTIES BUILD_RPATH
-                                                              "\$ORIGIN/../lib")
+set_target_properties(rocprofiler-sdk-lib-tests-shared PROPERTIES BUILD_RPATH
+                                                                  "\$ORIGIN/../lib")
 
 gtest_add_tests(
-    TARGET rocprofiler-lib-tests-shared
+    TARGET rocprofiler-sdk-lib-tests-shared
     SOURCES ${rocprofiler_shared_lib_sources}
     TEST_LIST shared_lib_TESTS
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
-set(rocprofiler-lib-tests-env
+set(rocprofiler-sdk-lib-tests-env
     "LD_LIBRARY_PATH=${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}:$ENV{LD_LIBRARY_PATH}")
 
 set_tests_properties(
     ${shared_lib_TESTS} PROPERTIES TIMEOUT 120 LABELS "unittests" ENVIRONMENT
-                                   "${rocprofiler-lib-tests-env}")
+                                   "${rocprofiler-sdk-lib-tests-env}")

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/thread_trace/CMakeLists.txt

@@ -1,8 +1,9 @@
 set(ROCPROFILER_LIB_THREAD_TRACE_SOURCES att_core.cpp att_service.cpp att_parser.cpp
                                          code_object.cpp)
 set(ROCPROFILER_LIB_THREAD_TRACE_HEADERS att_core.hpp code_object.hpp)
-target_sources(rocprofiler-object-library PRIVATE ${ROCPROFILER_LIB_THREAD_TRACE_SOURCES}
-                                                  ${ROCPROFILER_LIB_THREAD_TRACE_HEADERS})
+target_sources(
+    rocprofiler-sdk-object-library PRIVATE ${ROCPROFILER_LIB_THREAD_TRACE_SOURCES}
+                                           ${ROCPROFILER_LIB_THREAD_TRACE_HEADERS})
 
 if(ROCPROFILER_BUILD_TESTS)
     add_subdirectory(tests)

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/thread_trace/tests/CMakeLists.txt

@@ -10,11 +10,11 @@ target_sources(thread-trace-packet-test PRIVATE ${ROCPROFILER_THREAD_TRACE_TEST_
 
 target_link_libraries(
     thread-trace-packet-test
-    PRIVATE rocprofiler-sdk::rocprofiler-static-library
-            rocprofiler-sdk::rocprofiler-glog
-            rocprofiler-sdk::rocprofiler-hsa-runtime
-            rocprofiler-sdk::rocprofiler-hip
-            rocprofiler-sdk::rocprofiler-common-library
+    PRIVATE rocprofiler-sdk::rocprofiler-sdk-static-library
+            rocprofiler-sdk::rocprofiler-sdk-glog
+            rocprofiler-sdk::rocprofiler-sdk-hsa-runtime
+            rocprofiler-sdk::rocprofiler-sdk-hip
+            rocprofiler-sdk::rocprofiler-sdk-common-library
             GTest::gtest
             GTest::gtest_main
             rocprofiler-sdk::counter-test-constants)

projects/rocprofiler-sdk/source/lib/rocprofiler-sdk/tracing/CMakeLists.txt

@@ -2,5 +2,5 @@
 set(ROCPROFILER_LIB_TRACING_SOURCES)
 set(ROCPROFILER_LIB_TRACING_HEADERS fwd.hpp tracing.hpp)
 
-target_sources(rocprofiler-object-library PRIVATE ${ROCPROFILER_LIB_TRACING_SOURCES}
-                                                  ${ROCPROFILER_LIB_TRACING_HEADERS})
+target_sources(rocprofiler-sdk-object-library PRIVATE ${ROCPROFILER_LIB_TRACING_SOURCES}
+                                                      ${ROCPROFILER_LIB_TRACING_HEADERS})

projects/rocprofiler-sdk/source/lib/tests/buffering/CMakeLists.txt

@@ -11,8 +11,9 @@ add_executable(buffering-test)
 target_sources(buffering-test PRIVATE ${buffering_sources})
 target_link_libraries(
     buffering-test
-    PRIVATE rocprofiler-sdk::rocprofiler-headers
-            rocprofiler-sdk::rocprofiler-common-library GTest::gtest GTest::gtest_main)
+    PRIVATE rocprofiler-sdk::rocprofiler-sdk-headers
+            rocprofiler-sdk::rocprofiler-sdk-common-library GTest::gtest
+            GTest::gtest_main)
 
 gtest_add_tests(
     TARGET buffering-test

projects/rocprofiler-sdk/source/lib/tests/common/CMakeLists.txt

@@ -11,8 +11,9 @@ add_executable(common-tests)
 target_sources(common-tests PRIVATE ${common_sources})
 target_link_libraries(
     common-tests
-    PRIVATE rocprofiler-sdk::rocprofiler-headers
-            rocprofiler-sdk::rocprofiler-common-library GTest::gtest GTest::gtest_main)
+    PRIVATE rocprofiler-sdk::rocprofiler-sdk-headers
+            rocprofiler-sdk::rocprofiler-sdk-common-library GTest::gtest
+            GTest::gtest_main)
 
 gtest_add_tests(
     TARGET common-tests

projects/rocprofiler-sdk/source/libexec/rocprofv3-trigger-list-metrics/CMakeLists.txt

@@ -7,7 +7,7 @@ set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME "tools")
 add_executable(rocprofv3-trigger-list-metrics)
 target_sources(rocprofv3-trigger-list-metrics PRIVATE rocprofv3_trigger_list_metrics.cpp)
 target_link_libraries(rocprofv3-trigger-list-metrics
-                      PRIVATE rocprofiler-sdk::rocprofiler-hsa-runtime)
+                      PRIVATE rocprofiler-sdk::rocprofiler-sdk-hsa-runtime)
 set_target_properties(
     rocprofv3-trigger-list-metrics
     PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBEXECDIR}