AI/rocm-systems
2
0 Forc 0
Cód Saincheisteanna Iarratais Tarraingthe Gníomhartha Pacáistí Tionscadail Scaoileann Vicí Gníomhaíocht

Migrate to rocprofiler-sdk:: namespace in CMake everywhere (#892)

Brabhsáil Foinse 
- remove all usage/support for rocprofiler:: namespace
Tá an tiomantas seo le fáil i:
Jonathan R. Madsen údaraithe agus GitHub tiomanta 2024-05-29 22:28:43 -05:00
1 tuismitheoir 5525b400c3
tiomantas a76f61a0a3
41 comhad athraithe
+179 -169
Íoslódáil an comhad paiste Íoslódáil Comhad Diff Leathnaigh gach comhaid Laghdaigh gach comhaid

Níor tháinig aon chomhaid le do chuardach

cmake/Templates/rocprofiler-sdk/build-config.cmake.in
+2 -2
Féach ar an gComhad
@@ -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})
cmake/Templates/rocprofiler-sdk/config.cmake.in
+2 -5
Féach ar an gComhad
@@ -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})
cmake/rocprofiler_build_settings.cmake
+7 -7
Féach ar an gComhad
@@ -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)
cmake/rocprofiler_config_install.cmake
+2 -2
Féach ar an gComhad
@@ -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
cmake/rocprofiler_config_install_roctx.cmake
+5 -3
Féach ar an gComhad
@@ -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
cmake/rocprofiler_utilities.cmake
+6 -1
Féach ar an gComhad
@@ -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}