Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rocm-cmake for openSUSE:Factory checked in at 2026-09-21 14:29:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rocm-cmake (Old) and /work/SRC/openSUSE:Factory/.rocm-cmake.new.383539 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rocm-cmake" Mon Sep 21 14:29:16 2026 rev:2 rq:1378378 version:7.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/rocm-cmake/rocm-cmake.changes 2025-08-26 14:57:06.298660645 +0200 +++ /work/SRC/openSUSE:Factory/.rocm-cmake.new.383539/rocm-cmake.changes 2026-09-21 14:29:19.480893118 +0200 @@ -1,0 +2,55 @@ +Thu Jul 16 00:00:00 UTC 2026 - Fedora Release Engineering <[email protected]> + +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +------------------------------------------------------------------- +Thu Mar 5 00:00:00 UTC 2026 - Tom Rix <[email protected]> + +- Add --with preview + +------------------------------------------------------------------- +Thu Feb 12 00:00:00 UTC 2026 - Tom Rix <[email protected]> + +- Fix changelog + +------------------------------------------------------------------- +Sat Jan 24 00:00:00 UTC 2026 - Tom Rix <[email protected]> + +- Update to 7.2.0 + +------------------------------------------------------------------- +Sat Jan 17 00:00:00 UTC 2026 - Fedora Release Engineering <[email protected]> + +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +------------------------------------------------------------------- +Mon Dec 15 00:00:00 UTC 2025 - Tom Rix <[email protected]> + +- Add --with compat + +------------------------------------------------------------------- +Thu Oct 30 00:00:00 UTC 2025 - Tom Rix <[email protected]> + +- Update to 7.1.0 + +------------------------------------------------------------------- +Sat Sep 20 00:00:00 UTC 2025 - Tom Rix <[email protected]> + +- Update to 7.0.1 + +------------------------------------------------------------------- +Tue Sep 16 00:00:00 UTC 2025 - Tom Rix <[email protected]> + +- Update to 7.0.0 + +------------------------------------------------------------------- +Wed Aug 27 00:00:00 UTC 2025 - Tom Rix <[email protected]> + +- Add Fedora copyright + +------------------------------------------------------------------- +Mon Aug 25 00:00:00 UTC 2025 - Tom Rix <[email protected]> + +- Simplify file removal + +------------------------------------------------------------------- @@ -4,0 +60 @@ + Add: 0001-rocm-cmake-follow-cmake-install-rules.patch Old: ---- rocm-cmake-rocm-6.4.0.tar.gz New: ---- rocm-cmake-rocm-7.2.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rocm-cmake.spec ++++++ --- /var/tmp/diff_new_pack.BdZ7dn/_old 2026-09-21 14:29:20.525936862 +0200 +++ /var/tmp/diff_new_pack.BdZ7dn/_new 2026-09-21 14:29:20.527936946 +0200 @@ -1,7 +1,7 @@ # # spec file for package rocm-cmake # -# Copyright (c) 2025 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -14,27 +14,75 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # +# Copyright Fedora Project Authors. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. +# -%global debug_package %{nil} - -%global rocm_release 6.4 +%bcond_with preview +%if %{with preview} +%global rocm_release 7.14 +%global rocm_patch 0 +%global pkg_src therock-%{rocm_release} +%else +%global rocm_release 7.2 %global rocm_patch 0 +%global pkg_src rocm-%{rocm_release}.%{rocm_patch} +%endif + %global rocm_version %{rocm_release}.%{rocm_patch} -Name: rocm-cmake +%bcond_with compat +%if %{with compat} +# install to /usr/lib64/rocm/rocm-<major>.<minor> +%global pkg_prefix %{_prefix}/lib64/rocm/rocm-%{rocm_release}/ +%global pkg_suffix %{rocm_release} +%else +%global pkg_prefix %{_prefix} +%global pkg_suffix %{nil} +%endif +%global pkg_name rocm-cmake%{pkg_suffix} + +# there is no debug package - this is just cmake modules +%global debug_package %{nil} + +Name: %{pkg_name} Version: %{rocm_version} -Release: 3%{?dist} +%if %{with preview} +Release: 1%{?dist} +%else +Release: 4%{?dist} +%endif Summary: CMake modules for common build and development tasks for ROCm License: MIT URL: https://github.com/ROCm/rocm-cmake -Source: %{url}/archive/rocm-%{version}.tar.gz#/rocm-cmake-rocm-%{version}.tar.gz +Source: %{url}/archive/%{pkg_src}.tar.gz#/rocm-cmake-rocm-%{version}.tar.gz # https://github.com/ROCm/rocm-cmake/issues/276 Patch0: 0001-rocm-cmake-follow-cmake-install-rules.patch BuildArch: noarch BuildRequires: cmake +BuildRequires: rocm-filesystem%{pkg_suffix} + Requires: cmake +Requires: rocm-filesystem%{pkg_suffix} %description rocm-cmake is a collection of CMake modules for common build and development @@ -45,25 +93,26 @@ is required for building some of the libraries that are a part of ROCm. %prep -%autosetup -p1 -n rocm-cmake-rocm-%{version} +%autosetup -p1 -n rocm-cmake-%{pkg_src} + +# Another hardcoding of the libdir +sed -i -e 's@set(CMAKE_INSTALL_LIBDIR@#set(CMAKE_INSTALL_LIBDIR@' share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake +sed -i -e 's@set(CMAKE_INSTALL_LIBDIR@#set(CMAKE_INSTALL_LIBDIR@' share/rocmcmakebuildtools/cmake/ROCMInstallTargets.cmake %build -%cmake +%cmake -DCMAKE_INSTALL_PREFIX=%{pkg_prefix} %cmake_build %install %cmake_install -if [ -f %{buildroot}%{_prefix}/share/doc/rocm-cmake/LICENSE ]; then - rm %{buildroot}%{_prefix}/share/doc/rocm-cmake/LICENSE -fi +rm -f %{buildroot}%{pkg_prefix}/share/doc/rocm-cmake/LICENSE %files -%dir %{_datadir}/rocm -%dir %{_datadir}/rocmcmakebuildtools - +%if %{without compat} %doc CHANGELOG.md %license LICENSE -%{_datadir}/rocm/* -%{_datadir}/rocmcmakebuildtools/* +%endif +%{pkg_prefix}/share/rocm/ +%{pkg_prefix}/share/rocmcmakebuildtools/ ++++++ _scmsync.obsinfo ++++++ --- /var/tmp/diff_new_pack.BdZ7dn/_old 2026-09-21 14:29:20.560938327 +0200 +++ /var/tmp/diff_new_pack.BdZ7dn/_new 2026-09-21 14:29:20.563938453 +0200 @@ -1,6 +1,6 @@ -mtime: 1755941462 -commit: 1f9e4bf0005f7e71899da563b18cde9cbf686c07eae8e810da4f749790cb02ac -url: https://src.opensuse.org/ROCm/rocm-cmake.git -revision: 1f9e4bf0005f7e71899da563b18cde9cbf686c07eae8e810da4f749790cb02ac +mtime: 1789521711 +commit: e7b1e4c1d4215d29f683001e21030d54d70f1137d34bd770cba74e9ae71990de +url: https://src.opensuse.org/ROCm/rocm-cmake +revision: e7b1e4c1d4215d29f683001e21030d54d70f1137d34bd770cba74e9ae71990de projectscmsync: https://src.opensuse.org/ROCm/_ObsPrj ++++++ build.specials.obscpio ++++++ --- old/.gitignore 2025-08-23 11:34:59.000000000 +0200 +++ new/.gitignore 2026-09-16 03:21:51.000000000 +0200 @@ -4,3 +4,4 @@ _buildinfo* debian .osc +changelog ++++++ build.specials.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/.gitignore new/.gitignore --- old/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/.gitignore 2026-09-16 03:21:51.000000000 +0200 @@ -0,0 +1,7 @@ +sources +README.md +_buildconfig* +_buildinfo* +debian +.osc +changelog ++++++ rocm-cmake-rocm-6.4.0.tar.gz -> rocm-cmake-rocm-7.2.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/.github/workflows/test.yml new/rocm-cmake-rocm-7.2.0/.github/workflows/test.yml --- old/rocm-cmake-rocm-6.4.0/.github/workflows/test.yml 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/.github/workflows/test.yml 2025-12-11 06:12:24.000000000 +0100 @@ -11,7 +11,7 @@ with: access_token: ${{ github.token }} lint: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v1 - name: Set up Python 3.10 @@ -32,15 +32,17 @@ max-parallel: 4 matrix: platform: - - ubuntu-20.04 - - macos-12 - - windows-2019 + - ubuntu-24.04 + - windows-2022 cmake-version: - - 3.20.0 - - 3.10.2 + - 3.31.0 + - 3.22.1 + - 3.16.3 + # There are problems with nmake and ninja with this version of cmake + # on windows exclude: - - platform: windows-2019 - cmake-version: 3.10.2 + - platform: windows-2022 + cmake-version: 3.16.3 steps: - uses: actions/checkout@v1 @@ -61,12 +63,22 @@ uses: ssciwr/doxygen-install@v1 with: version: "1.10.0" - - name: Run tests + - name: Setup git run: | git config --global user.email "[email protected]" git config --global user.name "Your Name" - cmake --version - cget build --test - cget build -T doc - cget build -Cy --test -DROCM_CMAKE_GENERATOR=Ninja - cget build -T doc + + - name: Cmake version + run: cmake --version + + - name: Run tests (default generator) + run: cget build --test + + - name: Build docs (default generator) + run: cget build -T doc + + - name: Run tests (Ninja generator) + run: cget build -Cy --test -DROCM_CMAKE_GENERATOR=Ninja + + - name: Build docs (Ninja generator) + run: cget build -T doc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/CHANGELOG.md new/rocm-cmake-rocm-7.2.0/CHANGELOG.md --- old/rocm-cmake-rocm-6.4.0/CHANGELOG.md 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/CHANGELOG.md 2025-12-11 06:12:24.000000000 +0100 @@ -23,7 +23,7 @@ that developers switch to `find_package(ROCmCMakeBuildTools)` - ROCMInstallTargets: Stopped installing executables in ASAN builds -### Fixed +### Resolved issues - ROCMClangTidy: Fixed invalid list index in clang tidy - Fixed test failures when `ROCM_CMAKE_GENERATOR` is an empty string @@ -35,7 +35,7 @@ - ROCMSphinxDoc: Improved validation, documentation and rocm-docs-core integration. - Rename CMake package to ROCmCMakeBuildTools -### Fixed +### Resolved issues - ROCMClangTidy: Fixed extra make flags passed for clang tidy. - ROCMTest: Fixed issues when using module in a subdirectory. @@ -57,17 +57,17 @@ ## [rocm-cmake 0.8.1 for ROCm 5.5] -### Fixed - -- ROCMInstallTargets: Added compatibility symlinks for included cmake files in `<ROCM>/lib/cmake/<PACKAGE>`. - ### Changed - ROCMHeaderWrapper: The wrapper header deprecation message is now a deprecation warning. +### Resolved issues + +- ROCMInstallTargets: Added compatibility symlinks for included cmake files in `<ROCM>/lib/cmake/<PACKAGE>`. + ## [rocm-cmake 0.8.0 for ROCm 5.4] -### Fixed +### Resolved issues - ROCMCreatePackage: Fixed error in prerm scripts that could break package upgrades when using the `PTH` option. - Removed unnecessary requirement for having C and C++ compilers available when building rocm-cmake from source. @@ -78,10 +78,6 @@ ## [rocm-cmake 0.8.0 for ROCm 5.3] -### Fixed - -- Fixed error in prerm scripts created by `rocm_create_package` that could break uninstall for packages using the `PTH` option. - ### Changed - `ROCM_USE_DEV_COMPONENT` set to on by default for all platforms. This means that Windows will now generate runtime and devel packages by default @@ -89,6 +85,10 @@ - Changed default Debian compression type to xz and enabled multi-threaded package compression. - `rocm_create_package` will no longer warn upon failure to determine version of program rpmbuild. +### Resolved issues + +- Fixed error in prerm scripts created by `rocm_create_package` that could break uninstall for packages using the `PTH` option. + ## [0.7.3] ### Added @@ -96,7 +96,7 @@ - Header wrapper functionality included. This is to support the change in header file locations in ROCm 5.2, while providing backwards compatibility via header file wrappers. The associated deprecation warning can be disabled by defining `ROCM_NO_WRAPPER_HEADER_WARNING` before including the wrapper header. -### Fixed +### Resolved issues - Fixed spurious failures in `rocm_check_target_ids` for target ids with target features when `-Werror` is enabled. The `HAVE_<target-id>` result variable has been renamed to `COMPILER_HAS_TARGET_ID_<sanitized-target-id>`. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/CMakeLists.txt new/rocm-cmake-rocm-7.2.0/CMakeLists.txt --- old/rocm-cmake-rocm-6.4.0/CMakeLists.txt 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/CMakeLists.txt 2025-12-11 06:12:24.000000000 +0100 @@ -2,7 +2,7 @@ # Copyright (C) 2017 Advanced Micro Devices, Inc. ################################################################################ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.6...3.31.0) set(CMAKE_INSTALL_PREFIX "/opt/rocm" CACHE PATH "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/docs/requirements.in new/rocm-cmake-rocm-7.2.0/docs/requirements.in --- old/rocm-cmake-rocm-6.4.0/docs/requirements.in 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/docs/requirements.in 2025-12-11 06:12:24.000000000 +0100 @@ -1,2 +1,2 @@ sphinxcontrib-moderncmakedomain==3.29.0 -rocm-docs-core==1.9.2 +rocm-docs-core==1.17.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/docs/requirements.txt new/rocm-cmake-rocm-7.2.0/docs/requirements.txt --- old/rocm-cmake-rocm-6.4.0/docs/requirements.txt 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/docs/requirements.txt 2025-12-11 06:12:24.000000000 +0100 @@ -6,9 +6,16 @@ # accessible-pygments==0.0.5 # via pydata-sphinx-theme -alabaster==0.7.16 +alabaster==1.0.0 # via sphinx -babel==2.15.0 +asttokens==3.0.0 + # via stack-data +attrs==25.1.0 + # via + # jsonschema + # jupyter-cache + # referencing +babel==2.16.0 # via # pydata-sphinx-theme # sphinx @@ -16,19 +23,27 @@ # via pydata-sphinx-theme breathe==4.35.0 # via rocm-docs-core -certifi==2024.6.2 +certifi==2024.12.14 # via requests -cffi==1.16.0 +cffi==1.17.1 # via # cryptography # pynacl -charset-normalizer==3.3.2 +charset-normalizer==3.4.1 # via requests -click==8.1.7 - # via sphinx-external-toc -cryptography==42.0.8 +click==8.1.8 + # via + # jupyter-cache + # sphinx-external-toc +comm==0.2.2 + # via ipykernel +cryptography==44.0.0 # via pyjwt -deprecated==1.2.14 +debugpy==1.8.12 + # via ipykernel +decorator==5.1.1 + # via ipython +deprecated==1.2.18 # via pygithub docutils==0.21.2 # via @@ -36,73 +51,158 @@ # myst-parser # pydata-sphinx-theme # sphinx -fastjsonschema==2.19.1 - # via rocm-docs-core -gitdb==4.0.11 +executing==2.2.0 + # via stack-data +fastjsonschema==2.21.1 + # via + # nbformat + # rocm-docs-core +gitdb==4.0.12 # via gitpython -gitpython==3.1.43 +gitpython==3.1.44 # via rocm-docs-core -idna==3.7 +greenlet==3.1.1 + # via sqlalchemy +idna==3.10 # via requests imagesize==1.4.1 # via sphinx -jinja2==3.1.4 +importlib-metadata==8.6.1 + # via + # jupyter-cache + # myst-nb +ipykernel==6.29.5 + # via myst-nb +ipython==8.31.0 + # via + # ipykernel + # myst-nb +jedi==0.19.2 + # via ipython +jinja2==3.1.5 # via # myst-parser # sphinx +jsonschema==4.23.0 + # via nbformat +jsonschema-specifications==2024.10.1 + # via jsonschema +jupyter-cache==1.0.1 + # via myst-nb +jupyter-client==8.6.3 + # via + # ipykernel + # nbclient +jupyter-core==5.7.2 + # via + # ipykernel + # jupyter-client + # nbclient + # nbformat markdown-it-py==3.0.0 # via # mdit-py-plugins # myst-parser -markupsafe==2.1.5 +markupsafe==3.0.2 # via jinja2 -mdit-py-plugins==0.4.1 +matplotlib-inline==0.1.7 + # via + # ipykernel + # ipython +mdit-py-plugins==0.4.2 # via myst-parser mdurl==0.1.2 # via markdown-it-py -myst-parser==3.0.1 +myst-nb==1.1.2 # via rocm-docs-core -packaging==24.0 +myst-parser==4.0.0 + # via myst-nb +nbclient==0.10.2 + # via + # jupyter-cache + # myst-nb +nbformat==5.10.4 + # via + # jupyter-cache + # myst-nb + # nbclient +nest-asyncio==1.6.0 + # via ipykernel +packaging==24.2 # via - # pydata-sphinx-theme + # ipykernel # sphinx +parso==0.8.4 + # via jedi +pexpect==4.9.0 + # via ipython +platformdirs==4.3.6 + # via jupyter-core +prompt-toolkit==3.0.50 + # via ipython +psutil==6.1.1 + # via ipykernel +ptyprocess==0.7.0 + # via pexpect +pure-eval==0.2.3 + # via stack-data pycparser==2.22 # via cffi -pydata-sphinx-theme==0.15.3 +pydata-sphinx-theme==0.16.1 # via # rocm-docs-core # sphinx-book-theme -pygithub==2.3.0 +pygithub==2.5.0 # via rocm-docs-core -pygments==2.18.0 +pygments==2.19.1 # via # accessible-pygments + # ipython # pydata-sphinx-theme # sphinx -pyjwt[crypto]==2.8.0 +pyjwt[crypto]==2.10.1 # via pygithub pynacl==1.5.0 # via pygithub -pyyaml==6.0.1 +python-dateutil==2.9.0.post0 + # via jupyter-client +pyyaml==6.0.2 # via + # jupyter-cache + # myst-nb # myst-parser # rocm-docs-core # sphinx-external-toc +pyzmq==26.2.0 + # via + # ipykernel + # jupyter-client +referencing==0.36.2 + # via + # jsonschema + # jsonschema-specifications requests==2.32.3 # via # pygithub # sphinx -rocm-docs-core==1.9.2 +rocm-docs-core==1.17.0 # via -r requirements.in -smmap==5.0.1 +rpds-py==0.22.3 + # via + # jsonschema + # referencing +six==1.17.0 + # via python-dateutil +smmap==5.0.2 # via gitdb snowballstemmer==2.2.0 # via sphinx -soupsieve==2.5 +soupsieve==2.6 # via beautifulsoup4 -sphinx==7.3.7 +sphinx==8.1.3 # via # breathe + # myst-nb # myst-parser # pydata-sphinx-theme # rocm-docs-core @@ -112,37 +212,63 @@ # sphinx-external-toc # sphinx-notfound-page # sphinxcontrib-moderncmakedomain -sphinx-book-theme==1.1.2 +sphinx-book-theme==1.1.3 # via rocm-docs-core sphinx-copybutton==0.5.2 # via rocm-docs-core -sphinx-design==0.6.0 +sphinx-design==0.6.1 # via rocm-docs-core sphinx-external-toc==1.0.1 # via rocm-docs-core -sphinx-notfound-page==1.0.2 +sphinx-notfound-page==1.1.0 # via rocm-docs-core -sphinxcontrib-applehelp==1.0.8 +sphinxcontrib-applehelp==2.0.0 # via sphinx -sphinxcontrib-devhelp==1.0.6 +sphinxcontrib-devhelp==2.0.0 # via sphinx -sphinxcontrib-htmlhelp==2.0.5 +sphinxcontrib-htmlhelp==2.1.0 # via sphinx sphinxcontrib-jsmath==1.0.1 # via sphinx sphinxcontrib-moderncmakedomain==3.29.0 # via -r requirements.in -sphinxcontrib-qthelp==1.0.7 +sphinxcontrib-qthelp==2.0.0 # via sphinx -sphinxcontrib-serializinghtml==1.1.10 +sphinxcontrib-serializinghtml==2.0.0 # via sphinx +sqlalchemy==2.0.37 + # via jupyter-cache +stack-data==0.6.3 + # via ipython +tabulate==0.9.0 + # via jupyter-cache +tornado==6.4.2 + # via + # ipykernel + # jupyter-client +traitlets==5.14.3 + # via + # comm + # ipykernel + # ipython + # jupyter-client + # jupyter-core + # matplotlib-inline + # nbclient + # nbformat typing-extensions==4.12.2 # via + # myst-nb # pydata-sphinx-theme # pygithub -urllib3==2.2.1 + # sqlalchemy +urllib3==2.3.0 # via # pygithub # requests -wrapt==1.16.0 +wcwidth==0.2.13 + # via prompt-toolkit +wrapt==1.17.2 # via deprecated +zipp==3.21.0 + # via importlib-metadata diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/share/rocmcmakebuildtools/cmake/ROCMCheckTargetIds.cmake new/rocm-cmake-rocm-7.2.0/share/rocmcmakebuildtools/cmake/ROCMCheckTargetIds.cmake --- old/rocm-cmake-rocm-6.4.0/share/rocmcmakebuildtools/cmake/ROCMCheckTargetIds.cmake 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/share/rocmcmakebuildtools/cmake/ROCMCheckTargetIds.cmake 2025-12-11 06:12:24.000000000 +0100 @@ -21,6 +21,7 @@ foreach(_target_id ${PARSE_TARGETS}) _rocm_sanitize_target_id("${_target_id}" _result_var) set(_result_var "COMPILER_HAS_TARGET_ID_${_result_var}") + set(CMAKE_REQUIRED_LINK_OPTIONS "--hip-link") check_cxx_compiler_flag("-xhip --offload-arch=${_target_id}" "${_result_var}") if(${_result_var}) list(APPEND _supported_target_ids "${_target_id}") @@ -33,9 +34,26 @@ # CMake defines a preprocessor macro with this value, so it must be a valid C identifier # Handle + and - for xnack and sramecc so that e.g. xnack+ and xnack- doesn't get folded to # the same string by MAKE_C_IDENTIFIER - string(REPLACE "_" "__" TARGET_ID "${TARGET_ID}") - string(REPLACE "+" "_on" TARGET_ID "${TARGET_ID}") - string(REPLACE "-" "_off" TARGET_ID "${TARGET_ID}") + + # Target ID syntax: + # <target-id> ::== <processor> ( ":" <target-feature> ( "+" | "-" ) )* + + # split target id by colon into a list of components + string(REPLACE ":" ";" _components "${TARGET_ID}") + list(GET _components 0 _processor) + list(REMOVE_AT _components 0) + # remove '-' from processor name + string(REPLACE "-" "_" _processor "${_processor}") + if(_components) + # remove '+' or '-' from target features + string(REPLACE "+" "_on" _components "${_components}") + string(REPLACE "-" "_off" _components "${_components}") + # join components with a colon + string(REPLACE ";" ":" TARGET_ID "${_processor}:${_components}") + else() + set(TARGET_ID "${_processor}") + endif() + string(MAKE_C_IDENTIFIER "${TARGET_ID}" TARGET_ID) set(${VARIABLE} "${TARGET_ID}" PARENT_SCOPE) endfunction() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/share/rocmcmakebuildtools/cmake/ROCMClangTidy.cmake new/rocm-cmake-rocm-7.2.0/share/rocmcmakebuildtools/cmake/ROCMClangTidy.cmake --- old/rocm-cmake-rocm-6.4.0/share/rocmcmakebuildtools/cmake/ROCMClangTidy.cmake 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/share/rocmcmakebuildtools/cmake/ROCMClangTidy.cmake 2025-12-11 06:12:24.000000000 +0100 @@ -192,24 +192,26 @@ add_custom_target(tidy-target-${TARGET}) foreach(SOURCE ${SOURCES}) if(NOT "${SOURCE}" MATCHES "(h|hpp|hxx)$") - string(MAKE_C_IDENTIFIER "${SOURCE}" tidy_file) + get_filename_component(SRC_ABS ${SOURCE} ABSOLUTE) + string(FIND ${SRC_ABS} ${CMAKE_CURRENT_BINARY_DIR} BINARY_IDX) + if(BINARY_IDX EQUAL -1) + set(tidy_file_prefix "s") + set(ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}) + else() + set(tidy_file_prefix "b") + set(ROOT_DIR ${CMAKE_CURRENT_BINARY_DIR}) + endif() + get_filename_component(SRC_PATH ${SRC_ABS} DIRECTORY) + file(RELATIVE_PATH REL_PATH ${ROOT_DIR} ${SRC_PATH}) + get_filename_component(BASE_SOURCE_NAME ${SOURCE} NAME_WE) + if(REL_PATH) + set(BASE_SOURCE ${REL_PATH}/${BASE_SOURCE_NAME}) + else() + set(BASE_SOURCE ${BASE_SOURCE_NAME}) + endif() + string(MAKE_C_IDENTIFIER "${tidy_file_prefix}/${BASE_SOURCE}" tidy_file) set(tidy_target tidy-target-${TARGET}-${tidy_file}) if(CLANG_TIDY_CACHE_SIZE GREATER 0) - get_filename_component(SRC_ABS ${SOURCE} ABSOLUTE) - string(FIND ${SRC_ABS} ${CMAKE_CURRENT_BINARY_DIR} BINARY_IDX) - if(BINARY_IDX EQUAL -1) - set(ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}) - else() - set(ROOT_DIR ${CMAKE_CURRENT_BINARY_DIR}) - endif() - get_filename_component(SRC_PATH ${SRC_ABS} DIRECTORY) - file(RELATIVE_PATH REL_PATH ${ROOT_DIR} ${SRC_PATH}) - get_filename_component(BASE_SOURCE_NAME ${SOURCE} NAME_WE) - if(REL_PATH) - set(BASE_SOURCE ${REL_PATH}/${BASE_SOURCE_NAME}) - else() - set(BASE_SOURCE ${BASE_SOURCE_NAME}) - endif() file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/${tidy_target}.cmake " @@ -236,7 +238,9 @@ endif() return() endif() - string(REPLACE \"Preprocessing CXX source to \" \"\" PP_FILE \"\${PP_OUT}\") + # Filter out the message so it can handle verbose output + string(REGEX MATCH \"Preprocessing CXX source to [^\\n]*\\\\.i\\n\" PP_SELECT_OUT \"\${PP_OUT}\") + string(REPLACE \"Preprocessing CXX source to \" \"\" PP_FILE \"\${PP_SELECT_OUT}\") string(STRIP \"\${PP_FILE}\" PP_FILE) file(MD5 ${CMAKE_CURRENT_BINARY_DIR}/\${PP_FILE} PP_HASH) execute_process( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/share/rocmcmakebuildtools/cmake/ROCMCppCheck.cmake new/rocm-cmake-rocm-7.2.0/share/rocmcmakebuildtools/cmake/ROCMCppCheck.cmake --- old/rocm-cmake-rocm-6.4.0/share/rocmcmakebuildtools/cmake/ROCMCppCheck.cmake 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/share/rocmcmakebuildtools/cmake/ROCMCppCheck.cmake 2025-12-11 06:12:24.000000000 +0100 @@ -118,7 +118,7 @@ # cmake-lint: disable=C0301 set(CPPCHECK_TEMPLATE_ARG "--template=::warning file={file},line={line},col={column}::{severity}: {inconclusive:inconclusive: }{message} [{id}]" - "--template-location={file}:{line}:{column}: note: {info}\\\n{code}") + "--template-location={file}:{line}:{column}: note: {info}\\n{code}") endif() set(CPPCHECK_COMMAND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake new/rocm-cmake-rocm-7.2.0/share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake --- old/rocm-cmake-rocm-6.4.0/share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake 2025-12-11 06:12:24.000000000 +0100 @@ -402,10 +402,6 @@ file(WRITE ${PROJECT_BINARY_DIR}/debian/postinst "") file(WRITE ${PROJECT_BINARY_DIR}/debian/prerm "") - set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${PROJECT_BINARY_DIR}/debian/postinst;${PROJECT_BINARY_DIR}/debian/prerm") - set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${PROJECT_BINARY_DIR}/debian/postinst") - set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE "${PROJECT_BINARY_DIR}/debian/prerm") - if(PARSE_LDCONFIG AND NOT ${ROCM_DISABLE_LDCONFIG}) set(LDCONFIG_DIR ${LIB_DIR}) if(PARSE_LDCONFIG_DIR) @@ -417,7 +413,6 @@ echo \"${LDCONFIG_DIR}\" > /etc/ld.so.conf.d/${PARSE_NAME}.conf ldconfig ") - file( APPEND ${PROJECT_BINARY_DIR}/debian/prerm " @@ -433,10 +428,40 @@ if(PARSE_COMPONENTS) rocm_set_comp_cpackvar(PARSE_HEADER_ONLY "${PARSE_SUFFIX}" "${PARSE_COMPONENTS}") endif() + + # Lintian Warning Fix: Enable post/pre scripts only if non empty + rocm_check_and_configure_script_files("${PROJECT_BINARY_DIR}/debian/prerm" "${PROJECT_BINARY_DIR}/debian/postinst") + + # Create a CPack project config file for generator-specific settings + set(_cpack_project_config "${PROJECT_BINARY_DIR}/CPackProjectConfig.cmake") + file(WRITE "${_cpack_project_config}" " + # Generator-specific configuration for consistent archive paths + if(CPACK_GENERATOR MATCHES \"TGZ|ZIP\") + # Use relative paths for archive generators (consistent across platforms) + set(CPACK_SET_DESTDIR OFF) + set(CPACK_PACKAGING_INSTALL_PREFIX \"/\") + endif() + ") + set(CPACK_PROJECT_CONFIG_FILE "${_cpack_project_config}") + include(CPack) set(ROCM_PACKAGE_CREATED TRUE CACHE INTERNAL "Track whether rocm_create_package has been called.") endmacro() +# Check script File Size and then configure +macro(rocm_check_and_configure_script_files PS_SCRIPT_FILE PR_SCRIPT_FILE) + file(SIZE ${PS_SCRIPT_FILE} _postinst_file_sz) + if(${_postinst_file_sz} GREATER 0) + set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${PS_SCRIPT_FILE}") + set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${PS_SCRIPT_FILE}") + endif() + file(SIZE ${PR_SCRIPT_FILE} _prerm_file_sz) + if(${_prerm_file_sz} GREATER 0) + set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE "${PR_SCRIPT_FILE}") + set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA};${PR_SCRIPT_FILE}") + endif() +endmacro() + macro(rocm_setup_license HEADER_ONLY) if(NOT CPACK_RESOURCE_FILE_LICENSE) file(GLOB _license_files LIST_DIRECTORIES FALSE "${CMAKE_SOURCE_DIR}/LICENSE*") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/share/rocmcmakebuildtools/cmake/ROCMInstallTargets.cmake new/rocm-cmake-rocm-7.2.0/share/rocmcmakebuildtools/cmake/ROCMInstallTargets.cmake --- old/rocm-cmake-rocm-6.4.0/share/rocmcmakebuildtools/cmake/ROCMInstallTargets.cmake 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/share/rocmcmakebuildtools/cmake/ROCMInstallTargets.cmake 2025-12-11 06:12:24.000000000 +0100 @@ -341,7 +341,7 @@ set(CONFIG_NAME ${PACKAGE_NAME_LOWER}-config) set(TARGET_VERSION ${PROJECT_VERSION}) - if(PARSE_PREFIX) + if(PARSE_PREFIX AND NOT WIN32) set(PREFIX_DIR ${PARSE_PREFIX}) set(PREFIX_ARG PREFIX ${PREFIX_DIR}) set(BIN_INSTALL_DIR ${PREFIX_DIR}/${CMAKE_INSTALL_BINDIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/share/rocmcmakebuildtools/cmake/ROCMTest.cmake new/rocm-cmake-rocm-7.2.0/share/rocmcmakebuildtools/cmake/ROCMTest.cmake --- old/rocm-cmake-rocm-6.4.0/share/rocmcmakebuildtools/cmake/ROCMTest.cmake 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/share/rocmcmakebuildtools/cmake/ROCMTest.cmake 2025-12-11 06:12:24.000000000 +0100 @@ -19,19 +19,20 @@ add_custom_target(tests COMMENT "Build all tests.") add_dependencies(check tests) -add_custom_target(install-tests COMMAND ${CMAKE_COMMAND} -DCOMPONENT=tests -P ${CMAKE_BINARY_DIR}/cmake_install.cmake) +add_custom_target(install-tests COMMAND ${CMAKE_COMMAND} -DCOMPONENT=tests -DCMAKE_INSTALL_CONFIG_NAME=$<CONFIG> -P + ${CMAKE_BINARY_DIR}/cmake_install.cmake) 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}/libexec/installed-tests/${NAME}) + set_target_properties(tests PROPERTIES ROCM_TEST_INSTALLDIR ${CMAKE_INSTALL_LIBEXECDIR}/installed-tests/${NAME}) rocm_package_setup_component(tests DEPENDS COMPONENT runtime) rocm_defer(rocm_test_install_ctest) endmacro() if(POLICY CMP0079) - cmake_policy(SET CMP0079 OLD) + cmake_policy(SET CMP0079 NEW) endif() add_library(rocm_test_dependencies INTERFACE) @@ -89,9 +90,9 @@ set(COMMAND "") foreach(ARG ${PARSE_COMMAND}) if(TARGET ${ARG}) - set(INSTALL_PREFIX "$<${_rocm_test_genex_eval}:$<TARGET_PROPERTY:${ARG},ROCM_INSTALL_DIR>>") - string(APPEND COMMAND - " \"${INSTALL_PREFIX}/$<TARGET_FILE_NAME:${ARG}>\"") + set(INSTALL_PREFIX + "${CMAKE_INSTALL_PREFIX}/$<${_rocm_test_genex_eval}:$<TARGET_PROPERTY:${ARG},ROCM_INSTALL_DIR>>") + string(APPEND COMMAND " \"${INSTALL_PREFIX}/$<TARGET_FILE_NAME:${ARG}>\"") else() string(APPEND COMMAND " \"${ARG}\"") endif() @@ -159,7 +160,11 @@ set(COMMAND_ARGS ${COMMAND}) list(REMOVE_AT COMMAND_ARGS 0) - if(ROCM_TEST_GDB AND TARGET ${COMMAND_EXE}) + get_property(IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) + + if(NOT IS_MULTI_CONFIG + AND ROCM_TEST_GDB + AND TARGET ${COMMAND_EXE}) set(TEST_DIR ${CMAKE_CURRENT_BINARY_DIR}/gdb/test_${PARSE_NAME}) file(MAKE_DIRECTORY ${TEST_DIR}) if(NOT EXISTS ${TEST_DIR}) @@ -221,9 +226,15 @@ set(INSTALL_PREFIX "$<TARGET_PROPERTY:tests,ROCM_TEST_INSTALLDIR>") if(PARSE_TARGETS) foreach(TARGET ${PARSE_TARGETS}) - set_property(TARGET ${TARGET} APPEND PROPERTY INSTALL_RPATH "$ORIGIN/../../../../lib") + set_property( + TARGET ${TARGET} + APPEND + PROPERTY INSTALL_RPATH "$ORIGIN/../../../../lib") # Adding RPATH to public tests to point to private libraries. - set_property(TARGET ${TARGET} APPEND PROPERTY INSTALL_RPATH "$ORIGIN/../../../../lib/${PROJECT_NAME}/lib") + set_property( + TARGET ${TARGET} + APPEND + PROPERTY INSTALL_RPATH "$ORIGIN/../../../../lib/${PROJECT_NAME}/lib") endforeach() install( TARGETS ${PARSE_TARGETS} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/test/CMakeLists.txt new/rocm-cmake-rocm-7.2.0/test/CMakeLists.txt --- old/rocm-cmake-rocm-6.4.0/test/CMakeLists.txt 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/test/CMakeLists.txt 2025-12-11 06:12:24.000000000 +0100 @@ -15,13 +15,15 @@ endif() endmacro() -rocm_cmake_add_test_argument(CMAKE_MAKE_PROGRAM FILEPATH "Make program to relay to test projects") rocm_cmake_add_test_argument(CMAKE_GENERATOR STRING "Generator to relay to test projects") -rocm_cmake_add_test_argument(CMAKE_GENERATOR_INSTANCE STRING "Generator instance to relay to test projects") -rocm_cmake_add_test_argument(CMAKE_GENERATOR_PLATFORM STRING "Generator platform to relay to test projects") -rocm_cmake_add_test_argument(CMAKE_GENERATOR_TOOLSET STRING "Generator toolset to relay to test projects") rocm_cmake_add_test_argument(CMAKE_PREFIX_PATH PATH "Prefix path to relay to test projects") rocm_cmake_add_test_argument(CMAKE_PROGRAM_PATH PATH "Program path to relay to test projects") +if(ROCM_CMAKE_GENERATOR STREQUAL "${CMAKE_GENERATOR}") + rocm_cmake_add_test_argument(CMAKE_GENERATOR_INSTANCE STRING "Generator instance to relay to test projects") + rocm_cmake_add_test_argument(CMAKE_GENERATOR_PLATFORM STRING "Generator platform to relay to test projects") + rocm_cmake_add_test_argument(CMAKE_GENERATOR_TOOLSET STRING "Generator toolset to relay to test projects") + rocm_cmake_add_test_argument(CMAKE_MAKE_PROGRAM FILEPATH "Make program to relay to test projects") +endif() function(rocm_cmake_create_test NAME TEST) add_custom_target(${NAME} COMMAND ${CMAKE_COMMAND} ${TEST_ARGUMENTS} -P ${CMAKE_CURRENT_SOURCE_DIR}/test.cmake ${TEST} ${CMAKE_CURRENT_BINARY_DIR}/tmp/${NAME}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/test/analyze/CMakeLists.txt new/rocm-cmake-rocm-7.2.0/test/analyze/CMakeLists.txt --- old/rocm-cmake-rocm-6.4.0/test/analyze/CMakeLists.txt 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/test/analyze/CMakeLists.txt 2025-12-11 06:12:24.000000000 +0100 @@ -3,7 +3,7 @@ ################################################################################ -cmake_minimum_required (VERSION 3.5) +cmake_minimum_required (VERSION 3.5...3.31.0) project(simple LANGUAGES CXX) find_package(ROCmCMakeBuildTools) @@ -40,11 +40,17 @@ threadsafety ) +# Workaround clangTooling issue: https://github.com/llvm/llvm-project/issues/100909 +if(NOT MSVC) + add_compile_options(-Wno-unused-command-line-argument) +endif() + rocm_setup_version(VERSION 1.0.0) -configure_file(simple2.cpp.in simple2.cpp) +configure_file(simple2.cpp.in simple.cpp) +configure_file(simple_with_a_ridiculously_long_filename_in_order_to_test_long_filenames_in_clang_tidy_cmake.cpp.in simple_with_a_ridiculously_long_filename_in_order_to_test_long_filenames_in_clang_tidy_cmake.cpp) -add_library(simple simple.cpp ${CMAKE_CURRENT_BINARY_DIR}/simple2.cpp) +add_library(simple simple.cpp ${CMAKE_CURRENT_BINARY_DIR}/simple_with_a_ridiculously_long_filename_in_order_to_test_long_filenames_in_clang_tidy_cmake.cpp ${CMAKE_CURRENT_BINARY_DIR}/simple.cpp) rocm_install_targets(TARGETS simple INCLUDE include) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/test/analyze/include/simple.h new/rocm-cmake-rocm-7.2.0/test/analyze/include/simple.h --- old/rocm-cmake-rocm-6.4.0/test/analyze/include/simple.h 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/test/analyze/include/simple.h 2025-12-11 06:12:24.000000000 +0100 @@ -7,6 +7,8 @@ #define GUARD_SIMPLE_H void simple(); +void simple2(); +void simple_long(); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/test/analyze/simple.cpp new/rocm-cmake-rocm-7.2.0/test/analyze/simple.cpp --- old/rocm-cmake-rocm-6.4.0/test/analyze/simple.cpp 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/test/analyze/simple.cpp 2025-12-11 06:12:24.000000000 +0100 @@ -2,6 +2,7 @@ * Copyright (C) 2017 Advanced Micro Devices, Inc. ******************************************************************************/ +#include <simple.h> void simple() {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/test/analyze/simple2.cpp.in new/rocm-cmake-rocm-7.2.0/test/analyze/simple2.cpp.in --- old/rocm-cmake-rocm-6.4.0/test/analyze/simple2.cpp.in 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/test/analyze/simple2.cpp.in 2025-12-11 06:12:24.000000000 +0100 @@ -2,6 +2,7 @@ * Copyright (C) 2020 Advanced Micro Devices, Inc. ******************************************************************************/ +#include <simple.h> void simple2() {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/test/analyze/simple_with_a_ridiculously_long_filename_in_order_to_test_long_filenames_in_clang_tidy_cmake.cpp.in new/rocm-cmake-rocm-7.2.0/test/analyze/simple_with_a_ridiculously_long_filename_in_order_to_test_long_filenames_in_clang_tidy_cmake.cpp.in --- old/rocm-cmake-rocm-6.4.0/test/analyze/simple_with_a_ridiculously_long_filename_in_order_to_test_long_filenames_in_clang_tidy_cmake.cpp.in 1970-01-01 01:00:00.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/test/analyze/simple_with_a_ridiculously_long_filename_in_order_to_test_long_filenames_in_clang_tidy_cmake.cpp.in 2025-12-11 06:12:24.000000000 +0100 @@ -0,0 +1,8 @@ +/******************************************************************************* + * Copyright (C) 2017 Advanced Micro Devices, Inc. + ******************************************************************************/ + +#include <simple.h> + +void simple_long() +{} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/test/docsphinx/CMakeLists.txt new/rocm-cmake-rocm-7.2.0/test/docsphinx/CMakeLists.txt --- old/rocm-cmake-rocm-6.4.0/test/docsphinx/CMakeLists.txt 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/test/docsphinx/CMakeLists.txt 2025-12-11 06:12:24.000000000 +0100 @@ -2,7 +2,7 @@ # Copyright (C) 2023 Advanced Micro Devices, Inc. ################################################################################ -cmake_minimum_required (VERSION 3.5) +cmake_minimum_required (VERSION 3.5...3.31.0) project(useful LANGUAGES CXX) # Ideally should be NONE, but GNUInstallDirs detects platform arch using try_compile # https://stackoverflow.com/questions/43379311/why-does-project-affect-cmakes-opinion-on-cmake-sizeof-void-p diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/test/fail/wrapper.cmake new/rocm-cmake-rocm-7.2.0/test/fail/wrapper.cmake --- old/rocm-cmake-rocm-6.4.0/test/fail/wrapper.cmake 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/test/fail/wrapper.cmake 2025-12-11 06:12:24.000000000 +0100 @@ -2,7 +2,7 @@ # Copyright (C) 2022 Advanced Micro Devices, Inc. # ###################################################################################################################### -if(NOT MSVC) +if(NOT WIN32) install_dir(${TEST_DIR}/libwrapper CMAKE_ARGS -DBUILD_SHARED_LIBS=On -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=On -DERR_ON_WARN=ON) test_check_package( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/test/findpackagecheck/CMakeLists.txt new/rocm-cmake-rocm-7.2.0/test/findpackagecheck/CMakeLists.txt --- old/rocm-cmake-rocm-6.4.0/test/findpackagecheck/CMakeLists.txt 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/test/findpackagecheck/CMakeLists.txt 2025-12-11 06:12:24.000000000 +0100 @@ -1,5 +1,5 @@ -cmake_minimum_required (VERSION 3.5) +cmake_minimum_required (VERSION 3.5...3.31.0) project(findpackagecheck CXX) message(STATUS "PKG: ${PKG}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/test/libbasic/CMakeLists.txt new/rocm-cmake-rocm-7.2.0/test/libbasic/CMakeLists.txt --- old/rocm-cmake-rocm-6.4.0/test/libbasic/CMakeLists.txt 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/test/libbasic/CMakeLists.txt 2025-12-11 06:12:24.000000000 +0100 @@ -3,7 +3,7 @@ ################################################################################ -cmake_minimum_required (VERSION 3.5) +cmake_minimum_required (VERSION 3.5...3.31.0) project(basic CXX) find_package(ROCmCMakeBuildTools) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/test/libheaderonly/CMakeLists.txt new/rocm-cmake-rocm-7.2.0/test/libheaderonly/CMakeLists.txt --- old/rocm-cmake-rocm-6.4.0/test/libheaderonly/CMakeLists.txt 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/test/libheaderonly/CMakeLists.txt 2025-12-11 06:12:24.000000000 +0100 @@ -3,7 +3,7 @@ ################################################################################ -cmake_minimum_required (VERSION 3.5) +cmake_minimum_required (VERSION 3.5...3.31.0) project(headeronly LANGUAGES NONE) find_package(ROCmCMakeBuildTools) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/test/libprivate/CMakeLists.txt new/rocm-cmake-rocm-7.2.0/test/libprivate/CMakeLists.txt --- old/rocm-cmake-rocm-6.4.0/test/libprivate/CMakeLists.txt 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/test/libprivate/CMakeLists.txt 2025-12-11 06:12:24.000000000 +0100 @@ -3,7 +3,7 @@ ################################################################################ -cmake_minimum_required (VERSION 3.5) +cmake_minimum_required (VERSION 3.5...3.31.0) project(libprivate CXX) find_package(ROCmCMakeBuildTools) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/test/libsimple/CMakeLists.txt new/rocm-cmake-rocm-7.2.0/test/libsimple/CMakeLists.txt --- old/rocm-cmake-rocm-6.4.0/test/libsimple/CMakeLists.txt 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/test/libsimple/CMakeLists.txt 2025-12-11 06:12:24.000000000 +0100 @@ -3,7 +3,7 @@ ################################################################################ -cmake_minimum_required (VERSION 3.5) +cmake_minimum_required (VERSION 3.5...3.31.0) project(simple CXX) find_package(ROCmCMakeBuildTools) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/test/libsimple2/CMakeLists.txt new/rocm-cmake-rocm-7.2.0/test/libsimple2/CMakeLists.txt --- old/rocm-cmake-rocm-6.4.0/test/libsimple2/CMakeLists.txt 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/test/libsimple2/CMakeLists.txt 2025-12-11 06:12:24.000000000 +0100 @@ -3,7 +3,7 @@ ################################################################################ -cmake_minimum_required (VERSION 3.5) +cmake_minimum_required (VERSION 3.5...3.31.0) project(simple2 CXX) find_package(ROCmCMakeBuildTools) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/test/libsimplecompat/CMakeLists.txt new/rocm-cmake-rocm-7.2.0/test/libsimplecompat/CMakeLists.txt --- old/rocm-cmake-rocm-6.4.0/test/libsimplecompat/CMakeLists.txt 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/test/libsimplecompat/CMakeLists.txt 2025-12-11 06:12:24.000000000 +0100 @@ -3,7 +3,7 @@ ################################################################################ -cmake_minimum_required (VERSION 3.5) +cmake_minimum_required (VERSION 3.5...3.31.0) project(simple CXX) find_package(ROCM) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/test/libsimpletest/CMakeLists.txt new/rocm-cmake-rocm-7.2.0/test/libsimpletest/CMakeLists.txt --- old/rocm-cmake-rocm-6.4.0/test/libsimpletest/CMakeLists.txt 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/test/libsimpletest/CMakeLists.txt 2025-12-11 06:12:24.000000000 +0100 @@ -3,7 +3,7 @@ ################################################################################ -cmake_minimum_required (VERSION 3.5) +cmake_minimum_required (VERSION 3.5...3.31.0) project(simple CXX) find_package(ROCmCMakeBuildTools) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/test/libwrapper/CMakeLists.txt new/rocm-cmake-rocm-7.2.0/test/libwrapper/CMakeLists.txt --- old/rocm-cmake-rocm-6.4.0/test/libwrapper/CMakeLists.txt 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/test/libwrapper/CMakeLists.txt 2025-12-11 06:12:24.000000000 +0100 @@ -3,7 +3,7 @@ ################################################################################ -cmake_minimum_required (VERSION 3.5) +cmake_minimum_required (VERSION 3.5...3.31.0) project(test-wrapper CXX) find_package(ROCmCMakeBuildTools) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/test/pass/analyze-gh.cmake new/rocm-cmake-rocm-7.2.0/test/pass/analyze-gh.cmake --- old/rocm-cmake-rocm-6.4.0/test/pass/analyze-gh.cmake 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/test/pass/analyze-gh.cmake 2025-12-11 06:12:24.000000000 +0100 @@ -2,9 +2,18 @@ # Copyright (C) 2020 Advanced Micro Devices, Inc. # ###################################################################################################################### -install_dir(${TEST_DIR}/analyze TARGETS analyze analyze) +if(WIN32) +install_dir(${TEST_DIR}/analyze) install_dir( ${TEST_DIR}/analyze - CMAKE_ARGS -DCLANG_TIDY_CACHE_SIZE=0 -DROCM_ENABLE_GH_ANNOTATIONS=On - TARGETS analyze analyze) + CMAKE_ARGS -DCLANG_TIDY_CACHE_SIZE=0 -DROCM_ENABLE_GH_ANNOTATIONS=On) + +else() + install_dir(${TEST_DIR}/analyze TARGETS analyze analyze) + + install_dir( + ${TEST_DIR}/analyze + CMAKE_ARGS -DCLANG_TIDY_CACHE_SIZE=0 -DROCM_ENABLE_GH_ANNOTATIONS=On + TARGETS analyze analyze) +endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/test/pass/analyze.cmake new/rocm-cmake-rocm-7.2.0/test/pass/analyze.cmake --- old/rocm-cmake-rocm-6.4.0/test/pass/analyze.cmake 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/test/pass/analyze.cmake 2025-12-11 06:12:24.000000000 +0100 @@ -2,9 +2,17 @@ # Copyright (C) 2017 Advanced Micro Devices, Inc. # ###################################################################################################################### -install_dir(${TEST_DIR}/analyze TARGETS analyze analyze) +if(WIN32) + install_dir(${TEST_DIR}/analyze) -install_dir( - ${TEST_DIR}/analyze - CMAKE_ARGS -DCLANG_TIDY_CACHE_SIZE=0 - TARGETS analyze analyze) + install_dir( + ${TEST_DIR}/analyze + CMAKE_ARGS -DCLANG_TIDY_CACHE_SIZE=0) +else() + install_dir(${TEST_DIR}/analyze TARGETS analyze analyze) + + install_dir( + ${TEST_DIR}/analyze + CMAKE_ARGS -DCLANG_TIDY_CACHE_SIZE=0 + TARGETS analyze analyze) +endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/test/pass/libprivate.cmake new/rocm-cmake-rocm-7.2.0/test/pass/libprivate.cmake --- old/rocm-cmake-rocm-6.4.0/test/pass/libprivate.cmake 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/test/pass/libprivate.cmake 2025-12-11 06:12:24.000000000 +0100 @@ -6,6 +6,11 @@ ${TEST_DIR}/libprivate CMAKE_ARGS -DROCM_SYMLINK_LIBS=OFF -DROCM_PREFIX=rocm TARGETS package) -test_expect_file(${PREFIX}/lib/libprivate/include/simpleprivate.h) -test_expect_file(${PREFIX}/lib/libprivate/lib/libsimple_private.a) +if(WIN32) + test_expect_file(${PREFIX}/include/simpleprivate.h) + test_expect_file(${PREFIX}/lib/simple_private.lib) +else() + test_expect_file(${PREFIX}/lib/libprivate/include/simpleprivate.h) + test_expect_file(${PREFIX}/lib/libprivate/lib/libsimple_private.a) +endif() install_dir(${TEST_DIR}/libprivate) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/test/pass/rocm-package-setup-component.cmake new/rocm-cmake-rocm-7.2.0/test/pass/rocm-package-setup-component.cmake --- old/rocm-cmake-rocm-6.4.0/test/pass/rocm-package-setup-component.cmake 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/test/pass/rocm-package-setup-component.cmake 2025-12-11 06:12:24.000000000 +0100 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.10...3.31.0) use_rocm_cmake() include(ROCMCreatePackage) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/test/pass/simple-prefix.cmake new/rocm-cmake-rocm-7.2.0/test/pass/simple-prefix.cmake --- old/rocm-cmake-rocm-6.4.0/test/pass/simple-prefix.cmake 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/test/pass/simple-prefix.cmake 2025-12-11 06:12:24.000000000 +0100 @@ -7,5 +7,7 @@ CMAKE_ARGS -DROCM_PREFIX=simple TARGETS package) test_expect_file(${PREFIX}/include/simple.h) -test_expect_file(${PREFIX}/simple/include/simple.h) +if(NOT WIN32) + test_expect_file(${PREFIX}/simple/include/simple.h) +endif() install_dir(${TEST_DIR}/libbasic) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/test/pass/simple-test-package.cmake new/rocm-cmake-rocm-7.2.0/test/pass/simple-test-package.cmake --- old/rocm-cmake-rocm-6.4.0/test/pass/simple-test-package.cmake 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/test/pass/simple-test-package.cmake 2025-12-11 06:12:24.000000000 +0100 @@ -7,5 +7,5 @@ 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_exec(COMMAND ${CMAKE_COMMAND} -E tar x ${TEST_PACKAGE} WORKING_DIRECTORY ${PREFIX}) test_expect_file(${PREFIX}/libexec/installed-tests/simple/CTestTestfile.cmake) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/test/test.cmake new/rocm-cmake-rocm-7.2.0/test/test.cmake --- old/rocm-cmake-rocm-6.4.0/test/test.cmake 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/test/test.cmake 2025-12-11 06:12:24.000000000 +0100 @@ -91,7 +91,13 @@ string(REPLACE "|" "\;" REAL_EXEC_COMMAND "${ARGN}") execute_process(${REAL_EXEC_COMMAND} RESULT_VARIABLE test_exec_RESULT) if(NOT test_exec_RESULT EQUAL 0) - message(FATAL_ERROR "Process failed: ${EXEC_COMMAND}") + # Build a quoted command string that shows argument boundaries clearly + set(test_exec_quoted_cmd "") + foreach(test_exec_arg ${ARGN}) + string(APPEND test_exec_quoted_cmd "\"${test_exec_arg}\" ") + endforeach() + + message(FATAL_ERROR "Process failed with exit code: ${test_exec_RESULT}\n" "Command: ${test_exec_quoted_cmd}\n") endif() endmacro() @@ -107,7 +113,12 @@ cmake_parse_arguments(PARSE "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) string(RANDOM BUILD_RAND) - set(BUILD_DIR ${BUILDS_DIR}/${BUILD_RAND}) + if(WIN32) + set(BUILD_DIR ${BUILDS_DIR}/${BUILD_RAND}) + else() + set(LONG_PATH "longer_pathname_so_that_rpms_can_support_packaging_the_debug_info_for_all_os_profiles") + set(BUILD_DIR ${BUILDS_DIR}/${BUILD_RAND}/${LONG_PATH}/src/out/some-os-version/version/build/rocm-cmake/build) + endif() if(NOT EXISTS ${BUILD_DIR}) file(MAKE_DIRECTORY ${BUILD_DIR}) endif() @@ -123,7 +134,9 @@ endforeach() if(PARSE_BUILD_DIR_VAR) - set(${PARSE_BUILD_DIR_VAR} ${BUILD_DIR} PARENT_SCOPE) + set(${PARSE_BUILD_DIR_VAR} + ${BUILD_DIR} + PARENT_SCOPE) else() file(REMOVE_RECURSE ${BUILD_DIR}) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/test/toolchain-var/CMakeLists.txt new/rocm-cmake-rocm-7.2.0/test/toolchain-var/CMakeLists.txt --- old/rocm-cmake-rocm-6.4.0/test/toolchain-var/CMakeLists.txt 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/test/toolchain-var/CMakeLists.txt 2025-12-11 06:12:24.000000000 +0100 @@ -3,7 +3,7 @@ ################################################################################ -cmake_minimum_required (VERSION 3.5) +cmake_minimum_required (VERSION 3.5...3.31.0) find_package(ROCmCMakeBuildTools) project(toolchain-var CXX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rocm-cmake-rocm-6.4.0/test/version/CMakeLists.txt new/rocm-cmake-rocm-7.2.0/test/version/CMakeLists.txt --- old/rocm-cmake-rocm-6.4.0/test/version/CMakeLists.txt 2024-11-30 21:47:40.000000000 +0100 +++ new/rocm-cmake-rocm-7.2.0/test/version/CMakeLists.txt 2025-12-11 06:12:24.000000000 +0100 @@ -2,7 +2,7 @@ # Copyright (C) 2017 Advanced Micro Devices, Inc. ################################################################################ -cmake_minimum_required (VERSION 3.5) +cmake_minimum_required (VERSION 3.5...3.31.0) project(simple LANGUAGES NONE) find_package(ROCmCMakeBuildTools)
