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 ...)`
このコミットが含まれているのは:
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
新しいイシューから参照
ユーザーをブロックする