Build system (libdw), correlation ID, and shebang fixes (#354)
* Fix compilation for output library - link to targets for ATT (amd-comgr, dw, elf) * Relax correlation ID retirement log failures - only fail for correlation ID retirement underflow when building in CI mode * Fix shebang for several files - license was inserted before shebang in several places * Update code coverage exclude folders for samples * Tweak to agent tests - test to make sure hsa agent is not the old value instead of testing that it is the new value * Fix libdw include/link --------- Co-authored-by: Jonathan R. Madsen <jonathanrmadsen@gmail.com>
This commit is contained in:
@@ -30,13 +30,24 @@ if(PkgConfig_FOUND)
|
||||
|
||||
if(DW_FOUND
|
||||
AND DW_INCLUDE_DIRS
|
||||
AND DW_LIBRARIES)
|
||||
AND DW_LINK_LIBRARIES)
|
||||
set(libdw_INCLUDE_DIR
|
||||
"${DW_INCLUDE_DIRS}"
|
||||
CACHE FILEPATH "libdw include directory")
|
||||
set(libdw_LIBRARY
|
||||
"${DW_LIBRARIES}"
|
||||
"${DW_LINK_LIBRARIES}"
|
||||
CACHE FILEPATH "libdw libraries")
|
||||
if(DW_PREFIX)
|
||||
set(libdw_ROOT_DIR
|
||||
"${DW_PREFIX}"
|
||||
CACHE FILEPATH "libdw root directory")
|
||||
endif()
|
||||
|
||||
if(DW_VERSION)
|
||||
set(libdw_VERSION
|
||||
"${DW_VERSION}"
|
||||
CACHE FILEPATH "libdw version")
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@@ -70,13 +81,13 @@ find_package_handle_standard_args(libdw DEFAULT_MSG libdw_LIBRARY libdw_INCLUDE_
|
||||
if(libdw_FOUND)
|
||||
if(NOT TARGET libdw::libdw)
|
||||
add_library(libdw::libdw INTERFACE IMPORTED)
|
||||
endif()
|
||||
|
||||
if(TARGET PkgConfig::DW AND DW_FOUND)
|
||||
target_link_libraries(libdw::libdw INTERFACE PkgConfig::DW)
|
||||
else()
|
||||
target_link_libraries(libdw::libdw INTERFACE ${libdw_LIBRARY})
|
||||
target_include_directories(libdw::libdw SYSTEM INTERFACE ${libdw_INCLUDE_DIR})
|
||||
if(TARGET PkgConfig::DW AND DW_FOUND)
|
||||
target_link_libraries(libdw::libdw INTERFACE PkgConfig::DW)
|
||||
else()
|
||||
target_link_libraries(libdw::libdw INTERFACE ${libdw_LIBRARY})
|
||||
target_include_directories(libdw::libdw SYSTEM INTERFACE ${libdw_INCLUDE_DIR})
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
||||
@@ -129,6 +129,17 @@ else()
|
||||
endforeach()
|
||||
endif()
|
||||
|
||||
if(EXISTS ${@PACKAGE_NAME@_CMAKE_DIR}/Modules)
|
||||
list(INSERT CMAKE_MODULE_PATH 0 ${@PACKAGE_NAME@_CMAKE_DIR}/Modules)
|
||||
find_package(libdw)
|
||||
list(REMOVE_AT CMAKE_MODULE_PATH 0)
|
||||
endif()
|
||||
|
||||
if(libdw_FOUND AND TARGET libdw::libdw)
|
||||
rocprofiler_config_nolink_target(@PACKAGE_NAME@::@PACKAGE_NAME@-external-nolink
|
||||
libdw::libdw)
|
||||
endif()
|
||||
|
||||
target_link_libraries(@PACKAGE_NAME@::@PACKAGE_NAME@
|
||||
INTERFACE @PACKAGE_NAME@::@PACKAGE_NAME@-external-nolink)
|
||||
endif()
|
||||
@@ -136,7 +147,8 @@ endif()
|
||||
add_executable(@PACKAGE_NAME@::rocprofv3 IMPORTED)
|
||||
set_property(
|
||||
TARGET @PACKAGE_NAME@::rocprofv3
|
||||
PROPERTY IMPORTED_LOCATION ${@PACKAGE_NAME@_ROOT_DIR}/@CMAKE_INSTALL_BINDIR@/rocprofv3)
|
||||
PROPERTY IMPORTED_LOCATION
|
||||
${@PACKAGE_NAME@_ROOT_DIR}/@CMAKE_INSTALL_BINDIR@/rocprofv3)
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(
|
||||
@@ -155,4 +167,7 @@ endif()
|
||||
add_executable(@PACKAGE_NAME@::convert-counters-collection-format IMPORTED)
|
||||
set_property(
|
||||
TARGET @PACKAGE_NAME@::convert-counters-collection-format
|
||||
PROPERTY IMPORTED_LOCATION ${@PACKAGE_NAME@_ROOT_DIR}/share/@PACKAGE_NAME@/convert-counters-collection-format.py)
|
||||
PROPERTY
|
||||
IMPORTED_LOCATION
|
||||
${@PACKAGE_NAME@_ROOT_DIR}/share/@PACKAGE_NAME@/convert-counters-collection-format.py
|
||||
)
|
||||
|
||||
@@ -46,7 +46,8 @@ install(
|
||||
|
||||
install(
|
||||
FILES ${PROJECT_SOURCE_DIR}/cmake/Modules/rocprofiler-sdk-custom-compilation.cmake
|
||||
FILES ${PROJECT_SOURCE_DIR}/cmake/Modules/rocprofiler-sdk-utilities.cmake
|
||||
${PROJECT_SOURCE_DIR}/cmake/Modules/rocprofiler-sdk-utilities.cmake
|
||||
${PROJECT_SOURCE_DIR}/cmake/Modules/Findlibdw.cmake
|
||||
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PACKAGE_NAME}/Modules
|
||||
COMPONENT development)
|
||||
|
||||
@@ -94,7 +95,8 @@ configure_file(
|
||||
${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/${PACKAGE_NAME}/${PACKAGE_NAME}-config-nolink-target.cmake
|
||||
COPYONLY)
|
||||
|
||||
foreach(_FILE rocprofiler-sdk-custom-compilation.cmake rocprofiler-sdk-utilities.cmake)
|
||||
foreach(_FILE rocprofiler-sdk-custom-compilation.cmake rocprofiler-sdk-utilities.cmake
|
||||
Findlibdw.cmake)
|
||||
configure_file(
|
||||
${PROJECT_SOURCE_DIR}/cmake/Modules/${_FILE}
|
||||
${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/${PACKAGE_NAME}/Modules/${_FILE}
|
||||
@@ -118,7 +120,7 @@ set(${PACKAGE_NAME}_BUILD_TREE
|
||||
ON
|
||||
CACHE BOOL "" FORCE)
|
||||
|
||||
set(PROJECT_BUILD_TREE_TARGETS headers shared-library build-flags stack-protector)
|
||||
set(PROJECT_BUILD_TREE_TARGETS headers shared-library build-flags stack-protector dw)
|
||||
|
||||
configure_file(
|
||||
${PROJECT_SOURCE_DIR}/cmake/Templates/${PACKAGE_NAME}/build-config.cmake.in
|
||||
|
||||
Reference in New Issue
Block a user