Merge branch 'develop' into amd/jmacaran/externalCImainline

ROCm · Aug 12, 2024 · cc5535f · cc5535f
2 parents ee67a39 + f1d1dc9
commit cc5535f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
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.13.0)
+rocm_setup_version(VERSION 0.14.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.29.0
-rocm-docs-core==1.4.0
+rocm-docs-core==1.6.2
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -92,7 +92,7 @@ requests==2.32.3
     # via
     #   pygithub
     #   sphinx
-rocm-docs-core==1.4.0
+rocm-docs-core==1.6.2
     # via -r requirements.in
 smmap==5.0.1
     # via gitdb
@@ -136,8 +136,6 @@ sphinxcontrib-qthelp==1.0.7
     # via sphinx
 sphinxcontrib-serializinghtml==1.1.10
     # via sphinx
-tomli==2.0.1
-    # via sphinx
 typing-extensions==4.12.2
     # via
     #   pydata-sphinx-theme

diff --git a/share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake b/share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake
@@ -531,7 +531,9 @@ macro(rocm_set_comp_cpackvar HEADER_ONLY NAME_SUFFIX components)
             set(CPACK_DEBIAN_RUNTIME_FILE_NAME "DEB-DEFAULT")
         endif()
         if (NOT ${HEADER_ONLY} AND BUILD_SHARED_LIBS)
-            set(CPACK_RPM_MAIN_COMPONENT "runtime")
+            if (NOT ENABLE_ASAN_PACKAGING)
+                set(CPACK_RPM_MAIN_COMPONENT "runtime")
+            endif()
             list(APPEND CPACK_COMPONENTS_ALL runtime)
         endif()
     endif()