-
Notifications
You must be signed in to change notification settings - Fork 43
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Rename CMake package to ROCmCMakeBuildTools #128
Merged
lawruble13
merged 13 commits into
ROCm:release-staging/rocm-rel-6.0
from
lawruble13:rename
Oct 11, 2023
Merged
Changes from 9 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
13fddbb
Initial work
lawruble13 7929877
Correct module path when testing
lawruble13 6001f53
Copyright info
lawruble13 bf12c2e
Tests use ROCmCMakeBuildTools
lawruble13 27fe29c
Update deprecation message and type
lawruble13 ff2f82b
Correct find_package redirect
lawruble13 2f02ee6
Update changelog
lawruble13 b41c6a6
Quote hinted path
lawruble13 bb2cbef
Change DEPRECATION to NOTICE
lawruble13 a1d5f70
Add test for the backwards compatibility alias
lawruble13 0aee51c
Update message to reflect not yet deprecated
lawruble13 28267dc
Merge branch 'release-staging/rocm-rel-6.0' into rename
lawruble13 6659970
Update message type
lawruble13 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,8 @@ | ||
# ###################################################################################################################### | ||
# Copyright (C) 2017 Advanced Micro Devices, Inc. | ||
# Copyright (C) 2023 Advanced Micro Devices, Inc. | ||
# ###################################################################################################################### | ||
|
||
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) | ||
include(ROCMChecks) | ||
message(NOTICE | ||
"Use of find_package(ROCM) is deprecated, please switch to find_package(ROCmCMakeBuildTools)." | ||
) | ||
find_package(ROCmCMakeBuildTools HINTS "${CMAKE_CURRENT_LIST_DIR}") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
# ###################################################################################################################### | ||
# Copyright (C) 2023 Advanced Micro Devices, Inc. | ||
# ###################################################################################################################### | ||
|
||
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/../../rocmcmakebuildtools/cmake) | ||
|
||
include(ROCmCMakeBuildToolsConfigVersion) |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 6 additions & 0 deletions
6
share/rocmcmakebuildtools/cmake/ROCmCMakeBuildToolsConfig.cmake
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
# ###################################################################################################################### | ||
# Copyright (C) 2017 Advanced Micro Devices, Inc. | ||
# ###################################################################################################################### | ||
|
||
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) | ||
include(ROCMChecks) |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,7 +6,7 @@ | |
cmake_minimum_required (VERSION 3.5) | ||
project(headeronly LANGUAGES NONE) | ||
|
||
find_package(ROCM) | ||
find_package(ROCmCMakeBuildTools) | ||
|
||
include(ROCMInstallTargets) | ||
include(ROCMPackageConfigHelpers) | ||
|
@@ -18,15 +18,15 @@ rocm_setup_version(VERSION 1.0.0) | |
|
||
if(ROCM_PREFIX) | ||
rocm_create_package( | ||
NAME headeronly | ||
NAME headeronly | ||
PREFIX ${ROCM_PREFIX} | ||
MAINTAINER "Amd [email protected]" | ||
PTH | ||
LDCONFIG | ||
HEADER_ONLY) | ||
else() | ||
rocm_create_package( | ||
NAME headeronly | ||
NAME headeronly | ||
MAINTAINER "Amd [email protected]" | ||
PTH | ||
LDCONFIG | ||
|
@@ -38,15 +38,15 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib) | |
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) | ||
|
||
add_library(headeronly INTERFACE) | ||
target_include_directories(headeronly | ||
INTERFACE | ||
target_include_directories(headeronly | ||
INTERFACE | ||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
$<INSTALL_INTERFACE:headeronly/include/>) | ||
|
||
if(ROCM_PREFIX) | ||
rocm_install_targets( | ||
TARGETS headeronly | ||
INCLUDE include | ||
TARGETS headeronly | ||
INCLUDE include | ||
PREFIX ${ROCM_PREFIX}) | ||
rocm_install( | ||
DIRECTORY | ||
|
@@ -58,8 +58,8 @@ if(ROCM_PREFIX) | |
PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ | ||
) | ||
rocm_export_targets( | ||
TARGETS headeronly | ||
INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/importtarget.cmake | ||
TARGETS headeronly | ||
INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/importtarget.cmake | ||
PREFIX ${ROCM_PREFIX}) | ||
rocm_install_symlink_subdir(${ROCM_PREFIX}) | ||
else() | ||
|
@@ -76,6 +76,6 @@ else() | |
PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ | ||
) | ||
rocm_export_targets( | ||
TARGETS headeronly | ||
TARGETS headeronly | ||
INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/importtarget.cmake) | ||
endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,7 +6,7 @@ | |
cmake_minimum_required (VERSION 3.5) | ||
project(simple CXX) | ||
|
||
find_package(ROCM) | ||
find_package(ROCmCMakeBuildTools) | ||
|
||
include(ROCMInstallTargets) | ||
include(ROCMPackageConfigHelpers) | ||
|
@@ -18,14 +18,14 @@ rocm_setup_version(VERSION 1.0.0) | |
|
||
if(ROCM_PREFIX) | ||
rocm_create_package( | ||
NAME simple | ||
NAME simple | ||
PREFIX ${ROCM_PREFIX} | ||
MAINTAINER "Amd [email protected]" | ||
PTH | ||
LDCONFIG) | ||
else() | ||
rocm_create_package( | ||
NAME simple | ||
NAME simple | ||
MAINTAINER "Amd [email protected]" | ||
PTH | ||
LDCONFIG) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,7 +6,7 @@ | |
cmake_minimum_required (VERSION 3.5) | ||
project(simple2 CXX) | ||
|
||
find_package(ROCM) | ||
find_package(ROCmCMakeBuildTools) | ||
|
||
include(ROCMInstallTargets) | ||
include(ROCMPackageConfigHelpers) | ||
|
@@ -20,13 +20,13 @@ rocm_setup_version(VERSION 1.0.0) | |
|
||
if(ROCM_PREFIX) | ||
rocm_create_package( | ||
NAME simple2 | ||
NAME simple2 | ||
PREFIX ${ROCM_PREFIX} | ||
MAINTAINER "Amd [email protected]" | ||
LDCONFIG) | ||
else() | ||
rocm_create_package( | ||
NAME simple2 | ||
NAME simple2 | ||
MAINTAINER "Amd [email protected]" | ||
LDCONFIG) | ||
endif() | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,7 +6,7 @@ | |
cmake_minimum_required (VERSION 3.5) | ||
project(simple CXX) | ||
|
||
find_package(ROCM) | ||
find_package(ROCmCMakeBuildTools) | ||
|
||
include(ROCMInstallTargets) | ||
include(ROCMPackageConfigHelpers) | ||
|
@@ -20,7 +20,7 @@ rocm_setup_version(VERSION 1.0.0) | |
rocm_enable_test_package(simple) | ||
|
||
rocm_create_package( | ||
NAME simple | ||
NAME simple | ||
MAINTAINER "Amd [email protected]" | ||
PTH | ||
LDCONFIG) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,7 +6,7 @@ | |
cmake_minimum_required (VERSION 3.5) | ||
project(test-wrapper CXX) | ||
|
||
find_package(ROCM) | ||
find_package(ROCmCMakeBuildTools) | ||
|
||
include(ROCMInstallTargets) | ||
include(ROCMPackageConfigHelpers) | ||
|
@@ -19,14 +19,14 @@ rocm_setup_version(VERSION 1.0.0) | |
|
||
if(ROCM_PREFIX) | ||
rocm_create_package( | ||
NAME wrapper | ||
NAME wrapper | ||
PREFIX ${ROCM_PREFIX} | ||
MAINTAINER "Amd [email protected]" | ||
PTH | ||
LDCONFIG) | ||
else() | ||
rocm_create_package( | ||
NAME wrapper | ||
NAME wrapper | ||
MAINTAINER "Amd [email protected]" | ||
PTH | ||
LDCONFIG) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,7 +5,7 @@ | |
cmake_minimum_required (VERSION 3.5) | ||
project(simple LANGUAGES NONE) | ||
|
||
find_package(ROCM) | ||
find_package(ROCmCMakeBuildTools) | ||
|
||
include(ROCMSetupVersion) | ||
include(ROCMCreatePackage) | ||
|
@@ -32,7 +32,7 @@ endmacro() | |
@CONTENT@ | ||
|
||
rocm_create_package( | ||
NAME simple | ||
NAME simple | ||
MAINTAINER "Amd [email protected]" | ||
PTH | ||
LDCONFIG) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Then, you probably need to change the message to something like