Merge branch 'develop' into static-packaging

lawruble13 · May 9, 2024 · adc59cf · adc59cf
2 parents b6d2aab + f0d3cd7
commit adc59cf
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 7 deletions.
diff --git a/.azuredevops/rocm-ci.yml b/.azuredevops/rocm-ci.yml
@@ -0,0 +1,38 @@
+resources:
+  repositories:
+  - repository: pipelines_repo
+    type: github
+    endpoint: ROCm
+    name: ROCm/ROCm
+
+variables:
+- group: common
+- template: /.azuredevops/variables-global.yml@pipelines_repo
+
+trigger:
+  batch: true
+  branches:
+    include:
+    - develop
+  paths:
+    exclude:
+    - .github
+    - '.*.y*ml'
+    - '*.md'
+    - LICENSE
+
+pr:
+  autoCancel: true
+  branches:
+    include:
+    - develop
+  paths:
+    exclude:
+    - .github
+    - '.*.y*ml'
+    - '*.md'
+    - LICENSE
+  drafts: false
+
+jobs:
+  - template: ${{ variables.CI_COMPONENT_PATH }}/rocm-cmake.yml@pipelines_repo
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,19 @@
 - ROCmCreatePackage: Accepts a suffix parameter, automatically generating it for static or ASAN builds.
   - Package names will no longer be pulled from `CPACK_<GEN>_PACKAGE_NAME`
   - Runtime packages will no longer be generated for static builds
+## [rocm-cmake 0.12.0 for ROCm 6.1.0]
+### Added
+- ROCMTest: Add rpath to installed tests
+- AOCMCreatePackage: Allow additional provides on header-only packages
+- ROCMSphinxDoc: Allow separate source and config directories
+### Changed
+- Renamed CMake package to ROCmCMakeBuildTools. A wrapper has been provided
+  to ensure that `find_package(ROCM)` continues to work, but it is recommended
+  that developers switch to `find_package(ROCmCMakeBuildTools)`
+- ROCMInstallTargets: Stopped installing executables in ASAN builds
+### Fixed
+- ROCMClangTidy: Fixed invalid list index in clang tidy
+- Fixed test failures when `ROCM_CMAKE_GENERATOR` is an empty string
 
 ## [rocm-cmake 0.11.0 for ROCm 6.0.0]
 ### Changed

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,7 +20,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/share/rocmcmakebuildtool
 include(ROCMCreatePackage)
 include(ROCMSetupVersion)
 
-rocm_setup_version(VERSION 0.11.0)
+rocm_setup_version(VERSION 0.12.0)
 
 include(CMakePackageConfigHelpers)
 write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/ROCmCMakeBuildToolsConfigVersion.cmake

diff --git a/docs/requirements.in b/docs/requirements.in
@@ -1,2 +1,2 @@
 sphinxcontrib-moderncmakedomain==3.19
-rocm-docs-core==0.38.0
+rocm-docs-core==0.38.1
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -94,7 +94,7 @@ requests==2.31.0
     # via
     #   pygithub
     #   sphinx
-rocm-docs-core==0.38.0
+rocm-docs-core==0.38.1
     # via -r requirements.in
 six==1.16.0
     # via python-dateutil

diff --git a/share/rocmcmakebuildtools/cmake/ROCMTest.cmake b/share/rocmcmakebuildtools/cmake/ROCMTest.cmake
@@ -25,7 +25,7 @@ add_dependencies(install-tests tests)
 rocm_define_property(TARGET "ROCM_TEST_INSTALLDIR" "Install dir for tests")
 macro(rocm_enable_test_package NAME)
     message(STATUS "Enable test package ${NAME}")
-    set_target_properties(tests PROPERTIES ROCM_TEST_INSTALLDIR ${CMAKE_INSTALL_PREFIX}/share/test/${NAME})
+    set_target_properties(tests PROPERTIES ROCM_TEST_INSTALLDIR ${CMAKE_INSTALL_PREFIX}/libexec/installed-tests/${NAME})
     rocm_package_setup_component(tests DEPENDS COMPONENT runtime)
     rocm_defer(rocm_test_install_ctest)
 endmacro()

diff --git a/test/pass/simple-test-package.cmake b/test/pass/simple-test-package.cmake
@@ -8,4 +8,4 @@ list(LENGTH TEST_PACKAGE NTEST_PACKAGE)
 test_expect_eq(${NTEST_PACKAGE} 1)
 test_exec(COMMAND ${CMAKE_COMMAND} -E tar t ${TEST_PACKAGE})
 test_exec(COMMAND ${CMAKE_COMMAND} -E tar x ${TEST_PACKAGE} WORKING_DIRECTORY /)
-test_expect_file(${PREFIX}/share/test/simple/CTestTestfile.cmake)
+test_expect_file(${PREFIX}/libexec/installed-tests/simple/CTestTestfile.cmake)
diff --git a/test/pass/simple-test.cmake b/test/pass/simple-test.cmake
@@ -3,5 +3,5 @@
 # ######################################################################################################################
 
 install_dir(${TEST_DIR}/libsimpletest TARGETS check install-tests)
-test_expect_file(${PREFIX}/share/test/simple/CTestTestfile.cmake)
-test_exec(COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure WORKING_DIRECTORY ${PREFIX}/share/test/simple)
+test_expect_file(${PREFIX}/libexec/installed-tests/simple/CTestTestfile.cmake)
+test_exec(COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure WORKING_DIRECTORY ${PREFIX}/libexec/installed-tests/simple)