From fd996544338662959bee26c98b9ddb573cc56086 Mon Sep 17 00:00:00 2001 From: "Welton, Benjamin" Date: Thu, 13 Feb 2025 17:00:20 -0800 Subject: [PATCH] Fix install for conversion-script (#211) --- cmake/Templates/rocprofiler-sdk/config.cmake.in | 5 +++++ source/CMakeLists.txt | 1 + source/scripts/CMakeLists.txt | 17 +++++++++++++++++ tests/conversion-script/CMakeLists.txt | 5 ++--- 4 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 source/scripts/CMakeLists.txt diff --git a/cmake/Templates/rocprofiler-sdk/config.cmake.in b/cmake/Templates/rocprofiler-sdk/config.cmake.in index 972361391c..4fa28064df 100644 --- a/cmake/Templates/rocprofiler-sdk/config.cmake.in +++ b/cmake/Templates/rocprofiler-sdk/config.cmake.in @@ -150,3 +150,8 @@ find_package_handle_standard_args( if(EXISTS ${@PACKAGE_NAME@_CMAKE_DIR}/Modules) list(APPEND CMAKE_MODULE_PATH ${@PACKAGE_NAME@_CMAKE_DIR}/Modules) 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) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 6403aa4a92..ec8d12b383 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -17,3 +17,4 @@ add_subdirectory(lib) add_subdirectory(libexec) add_subdirectory(bin) add_subdirectory(docs) +add_subdirectory(scripts) diff --git a/source/scripts/CMakeLists.txt b/source/scripts/CMakeLists.txt new file mode 100644 index 0000000000..d35c80ec84 --- /dev/null +++ b/source/scripts/CMakeLists.txt @@ -0,0 +1,17 @@ +configure_file( + convert-counters-collection-format.py + ${PROJECT_BINARY_DIR}/share/rocprofiler-sdk/convert-counters-collection-format.py + COPYONLY) + +set(CONVERT_CC_FORMAT_PATH + ${PROJECT_BINARY_DIR}/share/rocprofiler-sdk/convert-counters-collection-format.py) + +add_executable(rocprofiler-sdk::convert-counters-collection-format IMPORTED) +set_property(TARGET rocprofiler-sdk::convert-counters-collection-format + PROPERTY IMPORTED_LOCATION ${CONVERT_CC_FORMAT_PATH}) + +install( + FILES + ${PROJECT_BINARY_DIR}/share/rocprofiler-sdk/convert-counters-collection-format.py + DESTINATION share/rocprofiler-sdk + COMPONENT core) diff --git a/tests/conversion-script/CMakeLists.txt b/tests/conversion-script/CMakeLists.txt index 41ae143db5..14ad4ea6f2 100644 --- a/tests/conversion-script/CMakeLists.txt +++ b/tests/conversion-script/CMakeLists.txt @@ -13,8 +13,6 @@ find_package(rocprofiler-sdk REQUIRED) rocprofiler_configure_pytest_files(COPY validate.py input.txt conftest.py CONFIG pytest.ini) -configure_file(${CMAKE_SOURCE_DIR}/source/scripts/convert-counters-collection-format.py - ${CMAKE_CURRENT_BINARY_DIR}/convert-counters-collection-format.py COPYONLY) add_test( NAME test-conversion-script-execute COMMAND @@ -36,7 +34,8 @@ set_tests_properties( add_test( NAME test-conversion-script-convert COMMAND - ${Python3_EXECUTABLE} convert-counters-collection-format.py --input + ${Python3_EXECUTABLE} + $ --input ${CMAKE_CURRENT_BINARY_DIR}/out_conversion_script --output ${CMAKE_CURRENT_BINARY_DIR}/out_conversion_script/converted.csv)