diff --git a/cmake/Templates/rocprofiler-sdk/build-config.cmake.in b/cmake/Templates/rocprofiler-sdk/build-config.cmake.in index ba316cad..04bd06a5 100644 --- a/cmake/Templates/rocprofiler-sdk/build-config.cmake.in +++ b/cmake/Templates/rocprofiler-sdk/build-config.cmake.in @@ -3,7 +3,7 @@ if(@PACKAGE_NAME@_FIND_COMPONENTS) foreach(COMP ${@PACKAGE_NAME@_FIND_COMPONENTS}) - set(TARG @PROJECT_NAME@::@PROJECT_NAME@-${COMP}) + set(TARG @PACKAGE_NAME@::@PROJECT_NAME@-${COMP}) if(TARGET ${TARG}) set(@PACKAGE_NAME@_${COMP}_FOUND 1) list(APPEND @PACKAGE_NAME@_LIBRARIES ${TARG}) @@ -17,7 +17,7 @@ else() endif() foreach(COMP @PROJECT_BUILD_TREE_TARGETS@) - set(TARG @PROJECT_NAME@::@PROJECT_NAME@-${COMP}) + set(TARG @PACKAGE_NAME@::@PROJECT_NAME@-${COMP}) if(TARGET ${TARG}) list(APPEND @PACKAGE_NAME@_LIBRARIES ${TARG}) target_link_libraries(@PACKAGE_NAME@::@PACKAGE_NAME@ INTERFACE ${TARG}) diff --git a/cmake/Templates/rocprofiler-sdk/config.cmake.in b/cmake/Templates/rocprofiler-sdk/config.cmake.in index 5967730c..8c0f5732 100644 --- a/cmake/Templates/rocprofiler-sdk/config.cmake.in +++ b/cmake/Templates/rocprofiler-sdk/config.cmake.in @@ -35,9 +35,6 @@ set(@PACKAGE_NAME@_LIBRARIES) # add interface library add_library(@PACKAGE_NAME@::@PACKAGE_NAME@ INTERFACE IMPORTED) -if(NOT TARGET @PROJECT_NAME@::@PROJECT_NAME@) - add_library(@PROJECT_NAME@::@PROJECT_NAME@ ALIAS @PACKAGE_NAME@::@PACKAGE_NAME@) -endif() target_include_directories(@PACKAGE_NAME@::@PACKAGE_NAME@ INTERFACE "${@PACKAGE_NAME@_INCLUDE_DIR}") @@ -110,7 +107,7 @@ else() # Library dependencies foreach(TARG @PROJECT_BUILD_TARGETS@) - set(TARG @PROJECT_NAME@::@PROJECT_NAME@-${TARG}) + set(TARG @PACKAGE_NAME@::@PROJECT_NAME@-${TARG}) if(NOT @PACKAGE_NAME@_FIND_COMPONENTS) list(APPEND @PACKAGE_NAME@_LIBRARIES ${TARG}) target_link_libraries(@PACKAGE_NAME@::@PACKAGE_NAME@ INTERFACE ${TARG}) @@ -119,7 +116,7 @@ else() if(@PACKAGE_NAME@_FIND_COMPONENTS) foreach(COMP ${@PACKAGE_NAME@_FIND_COMPONENTS}) - set(TARG @PROJECT_NAME@::${COMP}) + set(TARG @PACKAGE_NAME@::${COMP}) if(TARGET ${TARG}) set(@PACKAGE_NAME@_${COMP}_FOUND 1) list(APPEND @PACKAGE_NAME@_LIBRARIES ${TARG}) diff --git a/cmake/rocprofiler_build_settings.cmake b/cmake/rocprofiler_build_settings.cmake index 2e3e0d0e..1189575f 100644 --- a/cmake/rocprofiler_build_settings.cmake +++ b/cmake/rocprofiler_build_settings.cmake @@ -58,7 +58,7 @@ foreach(_TYPE dl rt) endif() endforeach() -target_link_libraries(rocprofiler-build-flags INTERFACE rocprofiler::rocprofiler-dl) +target_link_libraries(rocprofiler-build-flags INTERFACE rocprofiler-sdk::rocprofiler-dl) # ----------------------------------------------------------------------------------------# # set the compiler flags @@ -94,7 +94,7 @@ endif() if(ROCPROFILER_BUILD_DEBUG) target_link_libraries(rocprofiler-build-flags - INTERFACE rocprofiler::rocprofiler-debug-flags) + INTERFACE rocprofiler-sdk::rocprofiler-debug-flags) endif() # ----------------------------------------------------------------------------------------# @@ -115,7 +115,7 @@ rocprofiler_target_compile_options( if(ROCPROFILER_BUILD_STACK_PROTECTOR) target_link_libraries(rocprofiler-build-flags - INTERFACE rocprofiler::rocprofiler-stack-protector) + INTERFACE rocprofiler-sdk::rocprofiler-stack-protector) endif() # ----------------------------------------------------------------------------------------# @@ -128,7 +128,7 @@ rocprofiler_target_compile_options( if(ROCPROFILER_BUILD_DEVELOPER) target_link_libraries(rocprofiler-build-flags - INTERFACE rocprofiler::rocprofiler-developer-flags) + INTERFACE rocprofiler-sdk::rocprofiler-developer-flags) endif() # ----------------------------------------------------------------------------------------# @@ -142,7 +142,7 @@ rocprofiler_target_compile_options( if(ROCPROFILER_BUILD_RELEASE) target_link_libraries(rocprofiler-build-flags - INTERFACE rocprofiler::rocprofiler-release-flags) + INTERFACE rocprofiler-sdk::rocprofiler-release-flags) endif() # ----------------------------------------------------------------------------------------# @@ -166,12 +166,12 @@ target_link_options( if(ROCPROFILER_BUILD_STATIC_LIBGCC) target_link_libraries(rocprofiler-build-flags - INTERFACE rocprofiler::rocprofiler-static-libgcc) + INTERFACE rocprofiler-sdk::rocprofiler-static-libgcc) endif() if(ROCPROFILER_BUILD_STATIC_LIBSTDCXX) target_link_libraries(rocprofiler-build-flags - INTERFACE rocprofiler::rocprofiler-static-libstdcxx) + INTERFACE rocprofiler-sdk::rocprofiler-static-libstdcxx) endif() if(ROCPROFILER_UNSAFE_NO_VERSION_CHECK) diff --git a/cmake/rocprofiler_config_install.cmake b/cmake/rocprofiler_config_install.cmake index 5ad46564..53b2b431 100644 --- a/cmake/rocprofiler_config_install.cmake +++ b/cmake/rocprofiler_config_install.cmake @@ -23,7 +23,7 @@ install( install( EXPORT ${PACKAGE_NAME}-targets FILE ${PACKAGE_NAME}-targets.cmake - NAMESPACE ${PROJECT_NAME}:: + NAMESPACE ${PACKAGE_NAME}:: DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PACKAGE_NAME} COMPONENT development) @@ -112,7 +112,7 @@ endif() export( EXPORT ${PACKAGE_NAME}-targets - NAMESPACE ${PROJECT_NAME}:: + NAMESPACE ${PACKAGE_NAME}:: FILE "${_BUILDTREE_EXPORT_DIR}/${PACKAGE_NAME}-targets.cmake") set(${PACKAGE_NAME}_DIR diff --git a/cmake/rocprofiler_config_install_roctx.cmake b/cmake/rocprofiler_config_install_roctx.cmake index 6cf6f5fc..6ed66c82 100644 --- a/cmake/rocprofiler_config_install_roctx.cmake +++ b/cmake/rocprofiler_config_install_roctx.cmake @@ -4,6 +4,7 @@ include_guard(GLOBAL) include(CMakePackageConfigHelpers) set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME roctx) +set(SDK_PACKAGE_NAME "${PROJECT_NAME}-sdk") set(PACKAGE_NAME "rocprofiler-sdk-roctx") install( @@ -57,9 +58,10 @@ set(${PACKAGE_NAME}_BUILD_TREE CACHE BOOL "" FORCE) set(PROJECT_BUILD_TREE_TARGETS - ${PROJECT_NAME}::${PACKAGE_NAME}-shared-library - ${PROJECT_NAME}::${PROJECT_NAME}-headers ${PROJECT_NAME}::${PROJECT_NAME}-build-flags - ${PROJECT_NAME}::${PROJECT_NAME}-stack-protector) + ${SDK_PACKAGE_NAME}::${PACKAGE_NAME}-shared-library + ${SDK_PACKAGE_NAME}::${PROJECT_NAME}-headers + ${SDK_PACKAGE_NAME}::${PROJECT_NAME}-build-flags + ${SDK_PACKAGE_NAME}::${PROJECT_NAME}-stack-protector) configure_file( ${PROJECT_SOURCE_DIR}/cmake/Templates/${PACKAGE_NAME}/build-config.cmake.in diff --git a/cmake/rocprofiler_utilities.cmake b/cmake/rocprofiler_utilities.cmake index ffd9a66a..5887dfe0 100644 --- a/cmake/rocprofiler_utilities.cmake +++ b/cmake/rocprofiler_utilities.cmake @@ -358,7 +358,12 @@ function(ROCPROFILER_ADD_INTERFACE_LIBRARY _TARGET _DESCRIPT) else() add_library(${_TARGET} INTERFACE) endif() - add_library(${PROJECT_NAME}::${_TARGET} ALIAS ${_TARGET}) + + if(NOT PACKAGE_NAME OR "${PACKAGE_NAME}" STREQUAL "") + message(FATAL_ERROR "Set PACKAGE_NAME") + endif() + + add_library(${PACKAGE_NAME}::${_TARGET} ALIAS ${_TARGET}) if(NOT "INTERNAL" IN_LIST _ARGS AND NOT "IMPORTED" IN_LIST _ARGS) install( TARGETS ${_TARGET} diff --git a/samples/advanced_thread_trace/CMakeLists.txt b/samples/advanced_thread_trace/CMakeLists.txt index 76f1ae53..e92cddc6 100644 --- a/samples/advanced_thread_trace/CMakeLists.txt +++ b/samples/advanced_thread_trace/CMakeLists.txt @@ -47,7 +47,7 @@ target_sources(advanced-thread-trace PRIVATE main.cpp client.cpp) target_link_libraries( advanced-thread-trace PRIVATE rocprofiler-sdk::rocprofiler-sdk amd_comgr - rocprofiler::samples-common-library rocprofiler::samples-build-flags) + rocprofiler-sdk::samples-common-library rocprofiler-sdk::samples-build-flags) rocprofiler_samples_get_preload_env(PRELOAD_ENV advanced-thread-trace) diff --git a/samples/api_buffered_tracing/CMakeLists.txt b/samples/api_buffered_tracing/CMakeLists.txt index 293eb479..4f986ed0 100644 --- a/samples/api_buffered_tracing/CMakeLists.txt +++ b/samples/api_buffered_tracing/CMakeLists.txt @@ -31,8 +31,8 @@ add_library(buffered-api-tracing-client SHARED) target_sources(buffered-api-tracing-client PRIVATE client.cpp client.hpp) target_link_libraries( buffered-api-tracing-client - PRIVATE rocprofiler-sdk::rocprofiler-sdk rocprofiler::samples-build-flags - rocprofiler::samples-common-library) + PRIVATE rocprofiler-sdk::rocprofiler-sdk rocprofiler-sdk::samples-build-flags + rocprofiler-sdk::samples-common-library) set_source_files_properties(main.cpp PROPERTIES LANGUAGE HIP) find_package(Threads REQUIRED) @@ -41,7 +41,7 @@ add_executable(buffered-api-tracing) target_sources(buffered-api-tracing PRIVATE main.cpp) target_link_libraries( buffered-api-tracing PRIVATE buffered-api-tracing-client Threads::Threads - rocprofiler::samples-build-flags) + rocprofiler-sdk::samples-build-flags) rocprofiler_samples_get_preload_env(PRELOAD_ENV buffered-api-tracing-client) rocprofiler_samples_get_ld_library_path_env(LIBRARY_PATH_ENV) diff --git a/samples/api_callback_tracing/CMakeLists.txt b/samples/api_callback_tracing/CMakeLists.txt index 1c16335f..438e92fb 100644 --- a/samples/api_callback_tracing/CMakeLists.txt +++ b/samples/api_callback_tracing/CMakeLists.txt @@ -31,8 +31,8 @@ add_library(callback-api-tracing-client SHARED) target_sources(callback-api-tracing-client PRIVATE client.cpp client.hpp) target_link_libraries( callback-api-tracing-client - PRIVATE rocprofiler-sdk::rocprofiler-sdk rocprofiler::samples-build-flags - rocprofiler::samples-common-library) + PRIVATE rocprofiler-sdk::rocprofiler-sdk rocprofiler-sdk::samples-build-flags + rocprofiler-sdk::samples-common-library) set_source_files_properties(main.cpp PROPERTIES LANGUAGE HIP) @@ -44,7 +44,8 @@ target_sources(callback-api-tracing PRIVATE main.cpp) target_link_libraries( callback-api-tracing PRIVATE callback-api-tracing-client Threads::Threads - rocprofiler-sdk-roctx::rocprofiler-sdk-roctx rocprofiler::samples-build-flags) + rocprofiler-sdk-roctx::rocprofiler-sdk-roctx + rocprofiler-sdk::samples-build-flags) rocprofiler_samples_get_preload_env(PRELOAD_ENV callback-api-tracing-client) rocprofiler_samples_get_ld_library_path_env( diff --git a/samples/code_object_isa_decode/CMakeLists.txt b/samples/code_object_isa_decode/CMakeLists.txt index 9f7558db..cfdb8894 100644 --- a/samples/code_object_isa_decode/CMakeLists.txt +++ b/samples/code_object_isa_decode/CMakeLists.txt @@ -103,8 +103,8 @@ add_executable(code-object-isa-decode) target_sources(code-object-isa-decode PRIVATE main.cpp client.cpp) target_link_libraries( code-object-isa-decode - PRIVATE rocprofiler::samples-common-library rocprofiler-sdk::rocprofiler-sdk - amd_comgr rocprofiler::samples-build-flags) + PRIVATE rocprofiler-sdk::samples-common-library rocprofiler-sdk::rocprofiler-sdk + amd_comgr rocprofiler-sdk::samples-build-flags) rocprofiler_samples_get_preload_env(PRELOAD_ENV code-object-isa-decode) diff --git a/samples/code_object_tracing/CMakeLists.txt b/samples/code_object_tracing/CMakeLists.txt index bbf69b74..d2fd45e8 100644 --- a/samples/code_object_tracing/CMakeLists.txt +++ b/samples/code_object_tracing/CMakeLists.txt @@ -31,8 +31,8 @@ add_library(code-object-tracing-client SHARED) target_sources(code-object-tracing-client PRIVATE client.cpp) target_link_libraries( code-object-tracing-client - PRIVATE rocprofiler-sdk::rocprofiler-sdk rocprofiler::samples-build-flags - rocprofiler::samples-common-library) + PRIVATE rocprofiler-sdk::rocprofiler-sdk rocprofiler-sdk::samples-build-flags + rocprofiler-sdk::samples-common-library) set_source_files_properties(main.cpp PROPERTIES LANGUAGE HIP) find_package(Threads REQUIRED) @@ -41,7 +41,7 @@ add_executable(code-object-tracing) target_sources(code-object-tracing PRIVATE main.cpp) target_link_libraries( code-object-tracing PRIVATE code-object-tracing-client Threads::Threads - rocprofiler::samples-build-flags) + rocprofiler-sdk::samples-build-flags) add_test(NAME code-object-tracing COMMAND $) diff --git a/samples/common/CMakeLists.txt b/samples/common/CMakeLists.txt index e5f63b86..43eb8702 100644 --- a/samples/common/CMakeLists.txt +++ b/samples/common/CMakeLists.txt @@ -66,7 +66,7 @@ set(ROCPROFILER_DEFAULT_FAIL_REGEX # build flags add_library(rocprofiler-samples-build-flags INTERFACE) -add_library(rocprofiler::samples-build-flags ALIAS rocprofiler-samples-build-flags) +add_library(rocprofiler-sdk::samples-build-flags ALIAS rocprofiler-samples-build-flags) target_compile_options(rocprofiler-samples-build-flags INTERFACE -W -Wall -Wextra -Wshadow) target_compile_features(rocprofiler-samples-build-flags INTERFACE cxx_std_17) @@ -79,9 +79,10 @@ endif() cmake_path(GET CMAKE_CURRENT_SOURCE_DIR PARENT_PATH COMMON_LIBRARY_INCLUDE_DIR) add_library(rocprofiler-samples-common-library INTERFACE) -add_library(rocprofiler::samples-common-library ALIAS rocprofiler-samples-common-library) +add_library(rocprofiler-sdk::samples-common-library ALIAS + rocprofiler-samples-common-library) target_link_libraries(rocprofiler-samples-common-library - INTERFACE rocprofiler::samples-build-flags libdw::libdw) + INTERFACE rocprofiler-sdk::samples-build-flags libdw::libdw) target_compile_features(rocprofiler-samples-common-library INTERFACE cxx_std_17) target_include_directories(rocprofiler-samples-common-library INTERFACE ${COMMON_LIBRARY_INCLUDE_DIR}) diff --git a/samples/counter_collection/CMakeLists.txt b/samples/counter_collection/CMakeLists.txt index 128440e3..ea579769 100644 --- a/samples/counter_collection/CMakeLists.txt +++ b/samples/counter_collection/CMakeLists.txt @@ -31,8 +31,8 @@ add_library(counter-collection-buffer-client SHARED) target_sources(counter-collection-buffer-client PRIVATE client.cpp client.hpp) target_link_libraries( counter-collection-buffer-client - PUBLIC rocprofiler::samples-build-flags - PRIVATE rocprofiler-sdk::rocprofiler-sdk rocprofiler::samples-common-library) + PUBLIC rocprofiler-sdk::samples-build-flags + PRIVATE rocprofiler-sdk::rocprofiler-sdk rocprofiler-sdk::samples-common-library) set_source_files_properties(main.cpp PROPERTIES LANGUAGE HIP) add_executable(counter-collection-buffer) @@ -57,8 +57,8 @@ add_library(counter-collection-callback-client SHARED) target_sources(counter-collection-callback-client PRIVATE callback_client.cpp client.hpp) target_link_libraries( counter-collection-callback-client - PUBLIC rocprofiler::samples-build-flags - PRIVATE rocprofiler-sdk::rocprofiler-sdk rocprofiler::samples-common-library) + PUBLIC rocprofiler-sdk::samples-build-flags + PRIVATE rocprofiler-sdk::rocprofiler-sdk rocprofiler-sdk::samples-common-library) set_source_files_properties(main.cpp PROPERTIES LANGUAGE HIP) add_executable(counter-collection-callback) @@ -84,8 +84,8 @@ target_sources(counter-collection-functional-counter-client PRIVATE print_functional_counters.cpp client.hpp) target_link_libraries( counter-collection-functional-counter-client - PUBLIC rocprofiler::samples-build-flags - PRIVATE rocprofiler-sdk::rocprofiler-sdk rocprofiler::samples-common-library) + PUBLIC rocprofiler-sdk::samples-build-flags + PRIVATE rocprofiler-sdk::rocprofiler-sdk rocprofiler-sdk::samples-common-library) add_executable(counter-collection-print-functional-counters) target_sources(counter-collection-print-functional-counters PRIVATE main.cpp) @@ -112,8 +112,8 @@ target_sources(counter-collection-agent-profiling-client PRIVATE agent_profiling client.hpp) target_link_libraries( counter-collection-agent-profiling-client - PUBLIC rocprofiler::samples-build-flags - PRIVATE rocprofiler-sdk::rocprofiler-sdk rocprofiler::samples-common-library) + PUBLIC rocprofiler-sdk::samples-build-flags + PRIVATE rocprofiler-sdk::rocprofiler-sdk rocprofiler-sdk::samples-common-library) add_executable(counter-collection-agent-profiling) target_sources(counter-collection-agent-profiling PRIVATE main.cpp) diff --git a/samples/external_correlation_id_request/CMakeLists.txt b/samples/external_correlation_id_request/CMakeLists.txt index ed03511f..02769168 100644 --- a/samples/external_correlation_id_request/CMakeLists.txt +++ b/samples/external_correlation_id_request/CMakeLists.txt @@ -31,8 +31,8 @@ add_library(external-correlation-id-request-client SHARED) target_sources(external-correlation-id-request-client PRIVATE client.cpp client.hpp) target_link_libraries( external-correlation-id-request-client - PRIVATE rocprofiler-sdk::rocprofiler-sdk rocprofiler::samples-build-flags - rocprofiler::samples-common-library) + PRIVATE rocprofiler-sdk::rocprofiler-sdk rocprofiler-sdk::samples-build-flags + rocprofiler-sdk::samples-common-library) set_source_files_properties(main.cpp PROPERTIES LANGUAGE HIP) find_package(Threads REQUIRED) @@ -42,7 +42,7 @@ target_sources(external-correlation-id-request PRIVATE main.cpp) target_link_libraries( external-correlation-id-request PRIVATE external-correlation-id-request-client Threads::Threads - rocprofiler::samples-build-flags) + rocprofiler-sdk::samples-build-flags) rocprofiler_samples_get_preload_env(PRELOAD_ENV external-correlation-id-request-client) rocprofiler_samples_get_ld_library_path_env(LIBRARY_PATH_ENV) diff --git a/samples/intercept_table/CMakeLists.txt b/samples/intercept_table/CMakeLists.txt index 61ef5f64..448af53c 100644 --- a/samples/intercept_table/CMakeLists.txt +++ b/samples/intercept_table/CMakeLists.txt @@ -31,8 +31,8 @@ add_library(intercept-table-client SHARED) target_sources(intercept-table-client PRIVATE client.cpp client.hpp) target_link_libraries( intercept-table-client - PRIVATE rocprofiler-sdk::rocprofiler-sdk rocprofiler::samples-build-flags - rocprofiler::samples-common-library) + PRIVATE rocprofiler-sdk::rocprofiler-sdk rocprofiler-sdk::samples-build-flags + rocprofiler-sdk::samples-common-library) set_source_files_properties(main.cpp PROPERTIES LANGUAGE HIP) find_package(Threads REQUIRED) @@ -40,7 +40,7 @@ find_package(Threads REQUIRED) add_executable(intercept-table) target_sources(intercept-table PRIVATE main.cpp) target_link_libraries(intercept-table PRIVATE intercept-table-client Threads::Threads - rocprofiler::samples-build-flags) + rocprofiler-sdk::samples-build-flags) rocprofiler_samples_get_preload_env(PRELOAD_ENV intercept-table-client) rocprofiler_samples_get_ld_library_path_env(LIBRARY_PATH_ENV) diff --git a/samples/pc_sampling/CMakeLists.txt b/samples/pc_sampling/CMakeLists.txt index 552db639..313b78ff 100644 --- a/samples/pc_sampling/CMakeLists.txt +++ b/samples/pc_sampling/CMakeLists.txt @@ -31,8 +31,8 @@ add_library(pc-sampling-client SHARED) target_sources(pc-sampling-client PRIVATE client.cpp pcs.hpp pcs.cpp utils.hpp utils.cpp) target_link_libraries( pc-sampling-client - PRIVATE rocprofiler-sdk::rocprofiler-sdk rocprofiler::samples-build-flags - rocprofiler::samples-common-library) + PRIVATE rocprofiler-sdk::rocprofiler-sdk rocprofiler-sdk::samples-build-flags + rocprofiler-sdk::samples-common-library) set_source_files_properties(main.cpp PROPERTIES LANGUAGE HIP) find_package(Threads REQUIRED) @@ -40,7 +40,7 @@ find_package(Threads REQUIRED) add_executable(pc-sampling) target_sources(pc-sampling PRIVATE main.cpp) target_link_libraries(pc-sampling PRIVATE pc-sampling-client Threads::Threads - rocprofiler::samples-build-flags) + rocprofiler-sdk::samples-build-flags) rocprofiler_samples_get_preload_env(PRELOAD_ENV pc-sampling-client) rocprofiler_samples_get_ld_library_path_env(LIBRARY_PATH_ENV) diff --git a/source/lib/common/CMakeLists.txt b/source/lib/common/CMakeLists.txt index 743ca985..b10a6e3f 100644 --- a/source/lib/common/CMakeLists.txt +++ b/source/lib/common/CMakeLists.txt @@ -19,7 +19,7 @@ set(common_headers xml.hpp) add_library(rocprofiler-common-library STATIC) -add_library(rocprofiler::rocprofiler-common-library ALIAS rocprofiler-common-library) +add_library(rocprofiler-sdk::rocprofiler-common-library ALIAS rocprofiler-common-library) add_subdirectory(container) add_subdirectory(memory) @@ -30,17 +30,17 @@ target_include_directories(rocprofiler-common-library target_link_libraries( rocprofiler-common-library - PUBLIC $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $) + PUBLIC $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $) set_target_properties(rocprofiler-common-library PROPERTIES OUTPUT_NAME rocprofiler-common) diff --git a/source/lib/rocprofiler-sdk-codeobj/CMakeLists.txt b/source/lib/rocprofiler-sdk-codeobj/CMakeLists.txt index 637f5892..334819c2 100644 --- a/source/lib/rocprofiler-sdk-codeobj/CMakeLists.txt +++ b/source/lib/rocprofiler-sdk-codeobj/CMakeLists.txt @@ -19,7 +19,7 @@ set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME "development") add_library(rocprofiler-sdk-codeobj INTERFACE) -add_library(rocprofiler::rocprofiler-sdk-codeobj ALIAS rocprofiler-sdk-codeobj) +add_library(rocprofiler-sdk::rocprofiler-sdk-codeobj ALIAS rocprofiler-sdk-codeobj) target_include_directories( rocprofiler-sdk-codeobj @@ -28,8 +28,8 @@ target_include_directories( target_link_libraries( rocprofiler-sdk-codeobj - INTERFACE rocprofiler::rocprofiler-amd-comgr rocprofiler::rocprofiler-dw - rocprofiler::rocprofiler-elf) + INTERFACE rocprofiler-sdk::rocprofiler-amd-comgr rocprofiler-sdk::rocprofiler-dw + rocprofiler-sdk::rocprofiler-elf) if(ROCPROFILER_BUILD_TESTS) add_subdirectory(tests) diff --git a/source/lib/rocprofiler-sdk-codeobj/tests/CMakeLists.txt b/source/lib/rocprofiler-sdk-codeobj/tests/CMakeLists.txt index 9792eb8c..3181522c 100644 --- a/source/lib/rocprofiler-sdk-codeobj/tests/CMakeLists.txt +++ b/source/lib/rocprofiler-sdk-codeobj/tests/CMakeLists.txt @@ -8,14 +8,14 @@ target_sources(codeobj-library-test PRIVATE ${CODEOBJ_LIB_TEST_SOURCES}) target_link_libraries( codeobj-library-test - PRIVATE rocprofiler::rocprofiler-static-library - rocprofiler::rocprofiler-glog - rocprofiler::rocprofiler-hsa-runtime - rocprofiler::rocprofiler-hip - rocprofiler::rocprofiler-common-library + PRIVATE rocprofiler-sdk::rocprofiler-static-library + rocprofiler-sdk::rocprofiler-glog + rocprofiler-sdk::rocprofiler-hsa-runtime + rocprofiler-sdk::rocprofiler-hip + rocprofiler-sdk::rocprofiler-common-library GTest::gtest GTest::gtest_main - rocprofiler::rocprofiler-sdk-codeobj) + rocprofiler-sdk::rocprofiler-sdk-codeobj) gtest_add_tests( TARGET codeobj-library-test diff --git a/source/lib/rocprofiler-sdk-roctx/CMakeLists.txt b/source/lib/rocprofiler-sdk-roctx/CMakeLists.txt index eda8161a..4f51e9eb 100644 --- a/source/lib/rocprofiler-sdk-roctx/CMakeLists.txt +++ b/source/lib/rocprofiler-sdk-roctx/CMakeLists.txt @@ -6,7 +6,7 @@ set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME "roctx") find_package(rocprofiler-register REQUIRED) add_library(rocprofiler-sdk-roctx-shared-library SHARED) -add_library(rocprofiler::rocprofiler-sdk-roctx-shared-library ALIAS +add_library(rocprofiler-sdk::rocprofiler-sdk-roctx-shared-library ALIAS rocprofiler-sdk-roctx-shared-library) add_library(rocprofiler-sdk-roctx::rocprofiler-sdk-roctx-shared-library ALIAS rocprofiler-sdk-roctx-shared-library) @@ -19,9 +19,11 @@ target_include_directories( $) target_link_libraries( rocprofiler-sdk-roctx-shared-library - PRIVATE rocprofiler-register::rocprofiler-register rocprofiler::rocprofiler-headers - rocprofiler::rocprofiler-build-flags rocprofiler::rocprofiler-memcheck - rocprofiler::rocprofiler-common-library) + PRIVATE rocprofiler-register::rocprofiler-register + rocprofiler-sdk::rocprofiler-headers + rocprofiler-sdk::rocprofiler-build-flags + rocprofiler-sdk::rocprofiler-memcheck + rocprofiler-sdk::rocprofiler-common-library) set_target_properties( rocprofiler-sdk-roctx-shared-library diff --git a/source/lib/rocprofiler-sdk-tool/CMakeLists.txt b/source/lib/rocprofiler-sdk-tool/CMakeLists.txt index fe17d41b..ccfe1dae 100644 --- a/source/lib/rocprofiler-sdk-tool/CMakeLists.txt +++ b/source/lib/rocprofiler-sdk-tool/CMakeLists.txt @@ -38,13 +38,13 @@ add_subdirectory(plugins) target_link_libraries( rocprofiler-sdk-tool - PRIVATE rocprofiler::rocprofiler-shared-library - rocprofiler::rocprofiler-headers - rocprofiler::rocprofiler-build-flags - rocprofiler::rocprofiler-memcheck - rocprofiler::rocprofiler-common-library - rocprofiler::rocprofiler-cereal - rocprofiler::rocprofiler-perfetto) + 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) set_target_properties( rocprofiler-sdk-tool @@ -64,7 +64,7 @@ install( 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::rocprofiler-hsa-runtime) + PRIVATE rocprofiler-sdk::rocprofiler-hsa-runtime) set_target_properties( rocprofv3-trigger-list-metrics PROPERTIES RUNTIME_OUTPUT_DIRECTORY diff --git a/source/lib/rocprofiler-sdk/CMakeLists.txt b/source/lib/rocprofiler-sdk/CMakeLists.txt index 4f8a5354..e140edd5 100644 --- a/source/lib/rocprofiler-sdk/CMakeLists.txt +++ b/source/lib/rocprofiler-sdk/CMakeLists.txt @@ -31,7 +31,7 @@ set(ROCPROFILER_LIB_SOURCES # ----------------------------------------------------------------------------------------# add_library(rocprofiler-object-library OBJECT) -add_library(rocprofiler::rocprofiler-object-library ALIAS rocprofiler-object-library) +add_library(rocprofiler-sdk::rocprofiler-object-library ALIAS rocprofiler-object-library) target_sources(rocprofiler-object-library PRIVATE ${ROCPROFILER_LIB_SOURCES} ${ROCPROFILER_LIB_HEADERS}) @@ -52,15 +52,15 @@ add_subdirectory(details) target_link_libraries( rocprofiler-object-library - PUBLIC rocprofiler::rocprofiler-headers rocprofiler::rocprofiler-hip-nolink - rocprofiler::rocprofiler-hsa-runtime-nolink - PRIVATE rocprofiler::rocprofiler-build-flags - rocprofiler::rocprofiler-memcheck - rocprofiler::rocprofiler-common-library - rocprofiler::rocprofiler-amd-comgr - rocprofiler::rocprofiler-hsa-aql - rocprofiler::rocprofiler-drm - rocprofiler::rocprofiler-hsakmt-nolink) + PUBLIC rocprofiler-sdk::rocprofiler-headers rocprofiler-sdk::rocprofiler-hip-nolink + rocprofiler-sdk::rocprofiler-hsa-runtime-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) target_compile_definitions(rocprofiler-object-library PRIVATE rocprofiler_EXPORTS=1) @@ -73,25 +73,26 @@ set_target_properties(rocprofiler-object-library PROPERTIES POSITION_INDEPENDENT # ----------------------------------------------------------------------------------------# add_library(rocprofiler-shared-library SHARED) -add_library(rocprofiler::rocprofiler-shared-library ALIAS rocprofiler-shared-library) +add_library(rocprofiler-sdk::rocprofiler-shared-library ALIAS rocprofiler-shared-library) target_sources( rocprofiler-shared-library - PRIVATE $ shared_library.cpp) + PRIVATE $ + shared_library.cpp) target_link_libraries( rocprofiler-shared-library - INTERFACE rocprofiler::rocprofiler-headers - $ - $ - PRIVATE rocprofiler::rocprofiler-hsa-runtime-nolink - rocprofiler::rocprofiler-hip-nolink - rocprofiler::rocprofiler-build-flags - rocprofiler::rocprofiler-memcheck - rocprofiler::rocprofiler-common-library - rocprofiler::rocprofiler-cxx-filesystem - rocprofiler::rocprofiler-dl - rocprofiler::rocprofiler-amd-comgr - rocprofiler::rocprofiler-object-library) + INTERFACE rocprofiler-sdk::rocprofiler-headers + $ + $ + 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) set_target_properties( rocprofiler-shared-library @@ -102,7 +103,7 @@ set_target_properties( INSTALL_RPATH "\$ORIGIN" DEFINE_SYMBOL rocprofiler_EXPORTS) -add_library(rocprofiler::rocprofiler-library ALIAS rocprofiler-shared-library) +add_library(rocprofiler-sdk::rocprofiler-library ALIAS rocprofiler-shared-library) install( TARGETS rocprofiler-shared-library @@ -117,16 +118,17 @@ install( # ----------------------------------------------------------------------------------------# add_library(rocprofiler-static-library EXCLUDE_FROM_ALL STATIC) -add_library(rocprofiler::rocprofiler-static-library ALIAS rocprofiler-static-library) +add_library(rocprofiler-sdk::rocprofiler-static-library ALIAS rocprofiler-static-library) target_sources(rocprofiler-static-library - PRIVATE $) + PRIVATE $) target_link_libraries( rocprofiler-static-library - PUBLIC rocprofiler::rocprofiler-headers rocprofiler::rocprofiler-hsa-runtime-nolink - rocprofiler::rocprofiler-hip-nolink - PRIVATE rocprofiler::rocprofiler-common-library - rocprofiler::rocprofiler-object-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) set_target_properties( rocprofiler-static-library PROPERTIES OUTPUT_NAME rocprofiler-sdk DEFINE_SYMBOL diff --git a/source/lib/rocprofiler-sdk/aql/tests/CMakeLists.txt b/source/lib/rocprofiler-sdk/aql/tests/CMakeLists.txt index 3600354a..5907cb77 100644 --- a/source/lib/rocprofiler-sdk/aql/tests/CMakeLists.txt +++ b/source/lib/rocprofiler-sdk/aql/tests/CMakeLists.txt @@ -10,9 +10,9 @@ target_sources(aql-test PRIVATE ${ROCPROFILER_LIB_AQL_TEST_SOURCES}) target_link_libraries( aql-test - PRIVATE rocprofiler::rocprofiler-static-library rocprofiler::rocprofiler-glog - rocprofiler::rocprofiler-hsa-runtime rocprofiler::rocprofiler-hip - rocprofiler::rocprofiler-common-library GTest::gtest GTest::gtest_main) + PRIVATE rocprofiler-sdk::rocprofiler-static-library rocprofiler-sdk::rocprofiler-glog + rocprofiler-sdk::rocprofiler-hsa-runtime rocprofiler-sdk::rocprofiler-hip + rocprofiler-sdk::rocprofiler-common-library GTest::gtest GTest::gtest_main) gtest_add_tests( TARGET aql-test diff --git a/source/lib/rocprofiler-sdk/counters/parser/CMakeLists.txt b/source/lib/rocprofiler-sdk/counters/parser/CMakeLists.txt index eed9f7a6..d8c17220 100644 --- a/source/lib/rocprofiler-sdk/counters/parser/CMakeLists.txt +++ b/source/lib/rocprofiler-sdk/counters/parser/CMakeLists.txt @@ -42,7 +42,7 @@ 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::rocprofiler-common-library) + PRIVATE rocprofiler-sdk::rocprofiler-common-library) target_sources(rocprofiler-object-library PUBLIC $) diff --git a/source/lib/rocprofiler-sdk/counters/parser/tests/CMakeLists.txt b/source/lib/rocprofiler-sdk/counters/parser/tests/CMakeLists.txt index 8a46a56e..62c13679 100644 --- a/source/lib/rocprofiler-sdk/counters/parser/tests/CMakeLists.txt +++ b/source/lib/rocprofiler-sdk/counters/parser/tests/CMakeLists.txt @@ -10,8 +10,8 @@ target_sources(parser-test PRIVATE ${ROCPROFILER_LIB_PARSER_TEST_SOURCES}) target_link_libraries( parser-test - PRIVATE rocprofiler::rocprofiler-common-library - rocprofiler::rocprofiler-static-library GTest::gtest GTest::gtest_main) + PRIVATE rocprofiler-sdk::rocprofiler-common-library + rocprofiler-sdk::rocprofiler-static-library GTest::gtest GTest::gtest_main) gtest_add_tests( TARGET parser-test diff --git a/source/lib/rocprofiler-sdk/counters/tests/CMakeLists.txt b/source/lib/rocprofiler-sdk/counters/tests/CMakeLists.txt index c9ffcba8..7a2954fb 100644 --- a/source/lib/rocprofiler-sdk/counters/tests/CMakeLists.txt +++ b/source/lib/rocprofiler-sdk/counters/tests/CMakeLists.txt @@ -53,9 +53,9 @@ add_dependencies(counter-test agent_hasco_targets) target_link_libraries( counter-test - PRIVATE rocprofiler::rocprofiler-hsa-runtime rocprofiler::rocprofiler-hip - rocprofiler::rocprofiler-common-library - rocprofiler::rocprofiler-static-library GTest::gtest GTest::gtest_main) + PRIVATE rocprofiler-sdk::rocprofiler-hsa-runtime rocprofiler-sdk::rocprofiler-hip + rocprofiler-sdk::rocprofiler-common-library + rocprofiler-sdk::rocprofiler-static-library GTest::gtest GTest::gtest_main) gtest_add_tests( TARGET counter-test diff --git a/source/lib/rocprofiler-sdk/pc_sampling/parser/tests/CMakeLists.txt b/source/lib/rocprofiler-sdk/pc_sampling/parser/tests/CMakeLists.txt index 401c7c08..0f14442f 100644 --- a/source/lib/rocprofiler-sdk/pc_sampling/parser/tests/CMakeLists.txt +++ b/source/lib/rocprofiler-sdk/pc_sampling/parser/tests/CMakeLists.txt @@ -18,8 +18,8 @@ target_include_directories(pcs_gfx9_test PRIVATE ${PCTEST_INCLUDE_DIR}) target_link_libraries( pcs_gfx9_test - PRIVATE rocprofiler::rocprofiler-common-library - rocprofiler::rocprofiler-static-library GTest::gtest GTest::gtest_main) + PRIVATE rocprofiler-sdk::rocprofiler-common-library + rocprofiler-sdk::rocprofiler-static-library GTest::gtest GTest::gtest_main) gtest_add_tests( TARGET pcs_gfx9_test @@ -36,8 +36,8 @@ target_include_directories(pcs_id_test PRIVATE ${PCTEST_INCLUDE_DIR}) target_link_libraries( pcs_id_test - PRIVATE rocprofiler::rocprofiler-common-library - rocprofiler::rocprofiler-static-library GTest::gtest GTest::gtest_main) + PRIVATE rocprofiler-sdk::rocprofiler-common-library + rocprofiler-sdk::rocprofiler-static-library GTest::gtest GTest::gtest_main) gtest_add_tests( TARGET pcs_id_test @@ -56,5 +56,5 @@ target_include_directories(pcs_bench_test PRIVATE ${PCTEST_INCLUDE_DIR}) target_link_libraries( pcs_bench_test - PRIVATE rocprofiler::rocprofiler-common-library - rocprofiler::rocprofiler-static-library GTest::gtest GTest::gtest_main) + PRIVATE rocprofiler-sdk::rocprofiler-common-library + rocprofiler-sdk::rocprofiler-static-library GTest::gtest GTest::gtest_main) diff --git a/source/lib/rocprofiler-sdk/pc_sampling/tests/CMakeLists.txt b/source/lib/rocprofiler-sdk/pc_sampling/tests/CMakeLists.txt index 0f5a0f84..ff7bf2d7 100644 --- a/source/lib/rocprofiler-sdk/pc_sampling/tests/CMakeLists.txt +++ b/source/lib/rocprofiler-sdk/pc_sampling/tests/CMakeLists.txt @@ -15,8 +15,8 @@ target_sources(pcs-test PRIVATE ${ROCPROFILER_LIB_PC_SAMPLING_TEST_SOURCES} target_link_libraries( pcs-test - PRIVATE rocprofiler::rocprofiler-common-library - rocprofiler::rocprofiler-static-library GTest::gtest GTest::gtest_main) + PRIVATE rocprofiler-sdk::rocprofiler-common-library + rocprofiler-sdk::rocprofiler-static-library GTest::gtest GTest::gtest_main) gtest_add_tests( TARGET pcs-test diff --git a/source/lib/rocprofiler-sdk/tests/CMakeLists.txt b/source/lib/rocprofiler-sdk/tests/CMakeLists.txt index 9edf4d4c..68f4fec3 100644 --- a/source/lib/rocprofiler-sdk/tests/CMakeLists.txt +++ b/source/lib/rocprofiler-sdk/tests/CMakeLists.txt @@ -18,9 +18,9 @@ add_executable(rocprofiler-lib-tests) target_sources(rocprofiler-lib-tests PRIVATE ${rocprofiler_lib_sources} details/agent.cpp) target_link_libraries( rocprofiler-lib-tests - PRIVATE rocprofiler::rocprofiler-static-library - rocprofiler::rocprofiler-common-library rocprofiler::rocprofiler-hsa-runtime - GTest::gtest GTest::gtest_main) + PRIVATE rocprofiler-sdk::rocprofiler-static-library + rocprofiler-sdk::rocprofiler-common-library + rocprofiler-sdk::rocprofiler-hsa-runtime GTest::gtest GTest::gtest_main) gtest_add_tests( TARGET rocprofiler-lib-tests @@ -44,11 +44,11 @@ add_executable(rocprofiler-lib-tests-shared) target_sources(rocprofiler-lib-tests-shared PRIVATE ${rocprofiler_shared_lib_sources}) target_link_libraries( rocprofiler-lib-tests-shared - PRIVATE rocprofiler::rocprofiler-shared-library - rocprofiler::rocprofiler-common-library - rocprofiler::rocprofiler-hsa-runtime - rocprofiler::rocprofiler-drm - rocprofiler::rocprofiler-sdk-roctx-shared-library + PRIVATE rocprofiler-sdk::rocprofiler-shared-library + rocprofiler-sdk::rocprofiler-common-library + rocprofiler-sdk::rocprofiler-hsa-runtime + rocprofiler-sdk::rocprofiler-drm + rocprofiler-sdk::rocprofiler-sdk-roctx-shared-library GTest::gtest GTest::gtest_main) set_target_properties(rocprofiler-lib-tests-shared PROPERTIES BUILD_RPATH diff --git a/source/lib/rocprofiler-sdk/thread_trace/tests/CMakeLists.txt b/source/lib/rocprofiler-sdk/thread_trace/tests/CMakeLists.txt index 00bd67e4..1074fa92 100644 --- a/source/lib/rocprofiler-sdk/thread_trace/tests/CMakeLists.txt +++ b/source/lib/rocprofiler-sdk/thread_trace/tests/CMakeLists.txt @@ -10,9 +10,9 @@ target_sources(thread-trace-packet-test PRIVATE ${ROCPROFILER_THREAD_TRACE_TEST_ target_link_libraries( thread-trace-packet-test - PRIVATE rocprofiler::rocprofiler-static-library rocprofiler::rocprofiler-glog - rocprofiler::rocprofiler-hsa-runtime rocprofiler::rocprofiler-hip - rocprofiler::rocprofiler-common-library GTest::gtest GTest::gtest_main) + PRIVATE rocprofiler-sdk::rocprofiler-static-library rocprofiler-sdk::rocprofiler-glog + rocprofiler-sdk::rocprofiler-hsa-runtime rocprofiler-sdk::rocprofiler-hip + rocprofiler-sdk::rocprofiler-common-library GTest::gtest GTest::gtest_main) gtest_add_tests( TARGET thread-trace-packet-test diff --git a/source/lib/tests/buffering/CMakeLists.txt b/source/lib/tests/buffering/CMakeLists.txt index 54ed7312..d4c95e8c 100644 --- a/source/lib/tests/buffering/CMakeLists.txt +++ b/source/lib/tests/buffering/CMakeLists.txt @@ -11,8 +11,8 @@ add_executable(buffering-test) target_sources(buffering-test PRIVATE ${buffering_sources}) target_link_libraries( buffering-test - PRIVATE rocprofiler::rocprofiler-headers rocprofiler::rocprofiler-common-library - GTest::gtest GTest::gtest_main) + PRIVATE rocprofiler-sdk::rocprofiler-headers + rocprofiler-sdk::rocprofiler-common-library GTest::gtest GTest::gtest_main) gtest_add_tests( TARGET buffering-test diff --git a/source/lib/tests/common/CMakeLists.txt b/source/lib/tests/common/CMakeLists.txt index f4702ef6..e914001f 100644 --- a/source/lib/tests/common/CMakeLists.txt +++ b/source/lib/tests/common/CMakeLists.txt @@ -11,8 +11,8 @@ add_executable(common-tests) target_sources(common-tests PRIVATE ${common_sources}) target_link_libraries( common-tests - PRIVATE rocprofiler::rocprofiler-headers rocprofiler::rocprofiler-common-library - GTest::gtest GTest::gtest_main) + PRIVATE rocprofiler-sdk::rocprofiler-headers + rocprofiler-sdk::rocprofiler-common-library GTest::gtest GTest::gtest_main) gtest_add_tests( TARGET common-tests diff --git a/tests/async-copy-tracing/CMakeLists.txt b/tests/async-copy-tracing/CMakeLists.txt index 6f166dca..f35a112e 100644 --- a/tests/async-copy-tracing/CMakeLists.txt +++ b/tests/async-copy-tracing/CMakeLists.txt @@ -22,7 +22,7 @@ add_test(NAME test-async-copy-tracing-execute COMMAND $) set(async-copy-tracing-env "${PRELOAD_ENV}" "ROCPROFILER_TOOL_OUTPUT_FILE=async-copy-tracing-test.json" - "LD_LIBRARY_PATH=$:$ENV{LD_LIBRARY_PATH}" + "LD_LIBRARY_PATH=$:$ENV{LD_LIBRARY_PATH}" ) set_tests_properties( diff --git a/tests/bin/hsa-queue-dependency/CMakeLists.txt b/tests/bin/hsa-queue-dependency/CMakeLists.txt index 3d90ad20..35dbf316 100644 --- a/tests/bin/hsa-queue-dependency/CMakeLists.txt +++ b/tests/bin/hsa-queue-dependency/CMakeLists.txt @@ -69,7 +69,7 @@ target_link_libraries(multiqueue_testapp PRIVATE amd_comgr) find_package(rocprofiler-sdk REQUIRED) target_link_libraries(multiqueue_testapp PRIVATE rocprofiler-sdk::rocprofiler-sdk - rocprofiler::tests-common-library) + rocprofiler-sdk::tests-common-library) find_package( hsa-runtime64 diff --git a/tests/c-tool/CMakeLists.txt b/tests/c-tool/CMakeLists.txt index 120b39ff..5a35c0a2 100644 --- a/tests/c-tool/CMakeLists.txt +++ b/tests/c-tool/CMakeLists.txt @@ -21,7 +21,7 @@ add_test(NAME test-c-tool-execute COMMAND $ 1) set(c-tool-env "${PRELOAD_ENV}" - "LD_LIBRARY_PATH=$:$ENV{LD_LIBRARY_PATH}" + "LD_LIBRARY_PATH=$:$ENV{LD_LIBRARY_PATH}" ) set_tests_properties( diff --git a/tests/common/CMakeLists.txt b/tests/common/CMakeLists.txt index db04da96..9e99407a 100644 --- a/tests/common/CMakeLists.txt +++ b/tests/common/CMakeLists.txt @@ -32,7 +32,7 @@ set(GPU_TARGETS # build flags add_library(rocprofiler-tests-build-flags INTERFACE) -add_library(rocprofiler::tests-build-flags ALIAS rocprofiler-tests-build-flags) +add_library(rocprofiler-sdk::tests-build-flags ALIAS rocprofiler-tests-build-flags) target_compile_options(rocprofiler-tests-build-flags INTERFACE -W -Wall -Wextra -Wshadow) target_compile_features(rocprofiler-tests-build-flags INTERFACE cxx_std_17) @@ -41,11 +41,11 @@ if(ROCPROFILER_BUILD_CI OR ROCPROFILER_BUILD_WERROR) endif() # serialization library -if(NOT TARGET rocprofiler::rocprofiler-cereal) +if(NOT TARGET rocprofiler-sdk::rocprofiler-cereal) get_filename_component(ROCPROFILER_SOURCE_DIR "${PROJECT_SOURCE_DIR}/.." REALPATH) add_library(rocprofiler-cereal INTERFACE) - add_library(rocprofiler::rocprofiler-cereal ALIAS rocprofiler-cereal) + add_library(rocprofiler-sdk::rocprofiler-cereal ALIAS rocprofiler-cereal) target_compile_definitions(rocprofiler-cereal INTERFACE $) @@ -84,7 +84,7 @@ if(NOT TARGET rocprofiler::rocprofiler-cereal) endif() endif() -if(NOT TARGET rocprofiler::rocprofiler-perfetto) +if(NOT TARGET rocprofiler-sdk::rocprofiler-perfetto) # perfetto fetchcontent_declare( perfetto @@ -101,7 +101,7 @@ if(NOT TARGET rocprofiler::rocprofiler-perfetto) endif() add_library(rocprofiler-tests-perfetto STATIC) - add_library(rocprofiler::tests-perfetto ALIAS rocprofiler-tests-perfetto) + add_library(rocprofiler-sdk::tests-perfetto ALIAS rocprofiler-tests-perfetto) target_sources( rocprofiler-tests-perfetto PRIVATE ${PROJECT_BINARY_DIR}/external/perfetto/sdk/perfetto.h @@ -113,19 +113,19 @@ if(NOT TARGET rocprofiler::rocprofiler-perfetto) ON) else() add_library(rocprofiler-tests-perfetto INTERFACE) - add_library(rocprofiler::tests-perfetto ALIAS rocprofiler-tests-perfetto) + add_library(rocprofiler-sdk::tests-perfetto ALIAS rocprofiler-tests-perfetto) target_link_libraries(rocprofiler-tests-perfetto - INTERFACE rocprofiler::rocprofiler-perfetto) + INTERFACE rocprofiler-sdk::rocprofiler-perfetto) endif() # common utilities cmake_path(GET CMAKE_CURRENT_SOURCE_DIR PARENT_PATH COMMON_LIBRARY_INCLUDE_DIR) add_library(rocprofiler-tests-common-library INTERFACE) -add_library(rocprofiler::tests-common-library ALIAS rocprofiler-tests-common-library) +add_library(rocprofiler-sdk::tests-common-library ALIAS rocprofiler-tests-common-library) target_link_libraries( - rocprofiler-tests-common-library INTERFACE rocprofiler::tests-build-flags - rocprofiler::rocprofiler-cereal) + rocprofiler-tests-common-library INTERFACE rocprofiler-sdk::tests-build-flags + rocprofiler-sdk::rocprofiler-cereal) target_compile_features(rocprofiler-tests-common-library INTERFACE cxx_std_17) target_include_directories(rocprofiler-tests-common-library INTERFACE ${COMMON_LIBRARY_INCLUDE_DIR}) diff --git a/tests/hip-graph-tracing/CMakeLists.txt b/tests/hip-graph-tracing/CMakeLists.txt index 97a9d360..1f30ff54 100644 --- a/tests/hip-graph-tracing/CMakeLists.txt +++ b/tests/hip-graph-tracing/CMakeLists.txt @@ -27,7 +27,7 @@ add_test(NAME test-hip-graph-tracing-execute COMMAND $) set(hip-graph-tracing-env "${PRELOAD_ENV}" "ROCPROFILER_TOOL_OUTPUT_FILE=hip-graph-tracing-test.json" - "LD_LIBRARY_PATH=$:$ENV{LD_LIBRARY_PATH}" + "LD_LIBRARY_PATH=$:$ENV{LD_LIBRARY_PATH}" "ROCPROFILER_TOOL_CONTEXTS=HIP_API_CALLBACK,HIP_API_BUFFERED,KERNEL_DISPATCH_CALLBACK,KERNEL_DISPATCH_BUFFERED,CODE_OBJECT" ) diff --git a/tests/kernel-tracing/CMakeLists.txt b/tests/kernel-tracing/CMakeLists.txt index 2d5a9d13..41b3ccc2 100644 --- a/tests/kernel-tracing/CMakeLists.txt +++ b/tests/kernel-tracing/CMakeLists.txt @@ -27,7 +27,7 @@ add_test(NAME test-kernel-tracing-execute COMMAND $:$ENV{LD_LIBRARY_PATH}" + "LD_LIBRARY_PATH=$:$ENV{LD_LIBRARY_PATH}" ) set_tests_properties( diff --git a/tests/page-migration/CMakeLists.txt b/tests/page-migration/CMakeLists.txt index d2b580ac..f2a1454d 100644 --- a/tests/page-migration/CMakeLists.txt +++ b/tests/page-migration/CMakeLists.txt @@ -22,7 +22,7 @@ add_test(NAME test-page-migration-execute COMMAND $) set(page-migration-env "${PRELOAD_ENV}" "ROCPROFILER_TOOL_OUTPUT_FILE=page-migration-test.json" - "LD_LIBRARY_PATH=$:$ENV{LD_LIBRARY_PATH}" + "LD_LIBRARY_PATH=$:$ENV{LD_LIBRARY_PATH}" ) set_tests_properties( diff --git a/tests/scratch-memory-tracing/CMakeLists.txt b/tests/scratch-memory-tracing/CMakeLists.txt index b539fcab..28d8b4a0 100644 --- a/tests/scratch-memory-tracing/CMakeLists.txt +++ b/tests/scratch-memory-tracing/CMakeLists.txt @@ -22,7 +22,7 @@ add_test(NAME test-scratch-memory-tracing-execute COMMAND $:$ENV{LD_LIBRARY_PATH}" + "LD_LIBRARY_PATH=$:$ENV{LD_LIBRARY_PATH}" ) set_tests_properties( diff --git a/tests/tools/CMakeLists.txt b/tests/tools/CMakeLists.txt index cb31bb4a..4643ca70 100644 --- a/tests/tools/CMakeLists.txt +++ b/tests/tools/CMakeLists.txt @@ -15,9 +15,9 @@ add_library(rocprofiler-sdk-json-tool SHARED) target_sources(rocprofiler-sdk-json-tool PRIVATE json-tool.cpp) target_link_libraries( rocprofiler-sdk-json-tool - PRIVATE rocprofiler-sdk::rocprofiler-sdk rocprofiler::rocprofiler-cereal - rocprofiler::tests-build-flags rocprofiler::tests-common-library - rocprofiler::tests-perfetto) + PRIVATE rocprofiler-sdk::rocprofiler-sdk rocprofiler-sdk::rocprofiler-cereal + rocprofiler-sdk::tests-build-flags rocprofiler-sdk::tests-common-library + rocprofiler-sdk::tests-perfetto) set_target_properties( rocprofiler-sdk-json-tool PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/rocprofiler-sdk" @@ -30,7 +30,7 @@ set_target_properties( add_library(rocprofiler-sdk-c-tool SHARED) target_sources(rocprofiler-sdk-c-tool PRIVATE c-tool.c) target_link_libraries(rocprofiler-sdk-c-tool PRIVATE rocprofiler-sdk::rocprofiler-sdk - rocprofiler::tests-build-flags) + rocprofiler-sdk::tests-build-flags) set_target_properties( rocprofiler-sdk-c-tool PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/rocprofiler-sdk"