Add the modern version of Modules/FindLua.cmake, which works with Lua 5.5

OBS-URL: https://build.opensuse.org/request/show/1320931
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cmake?expand=0&rev=273

FindLua.cmake

@@ -0,0 +1,347 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file LICENSE.rst or https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+FindLua
+-------
+
+Finds the Lua library:
+
+.. code-block:: cmake
+
+  find_package(Lua [<version>] [...])
+
+Lua is a embeddable scripting language.
+
+.. versionadded:: 3.18
+  Support for Lua 5.4.
+
+.. versionadded:: 4.3
+  Support for Lua 5.5.
+
+When working with Lua, its library headers are intended to be included in
+project source code as:
+
+.. code-block:: c
+
+  #include <lua.h>
+
+and not:
+
+.. code-block:: c
+
+  #include <lua/lua.h>
+
+This is because, the location of Lua headers may differ across platforms and may
+exist in locations other than ``lua/``.
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This module defines the following variables:
+
+``Lua_FOUND``
+  .. versionadded:: 3.3
+
+  Boolean indicating whether (the requested version of) Lua was found.
+
+``Lua_VERSION``
+  .. versionadded:: 4.2
+
+  The version of Lua found.
+
+``Lua_VERSION_MAJOR``
+  .. versionadded:: 4.2
+
+  The major version of Lua found.
+
+``Lua_VERSION_MINOR``
+  .. versionadded:: 4.2
+
+  The minor version of Lua found.
+
+``Lua_VERSION_PATCH``
+  .. versionadded:: 4.2
+
+  The patch version of Lua found.
+
+``LUA_LIBRARIES``
+  Libraries needed to link against to use Lua.  This list includes both ``lua``
+  and ``lualib`` libraries.
+
+Cache Variables
+^^^^^^^^^^^^^^^
+
+The following cache variables may also be set:
+
+``LUA_INCLUDE_DIR``
+  The directory containing the Lua header files, such as ``lua.h``,
+  ``lualib.h``, and ``lauxlib.h``, needed to use Lua.
+
+Deprecated Variables
+^^^^^^^^^^^^^^^^^^^^
+
+The following variables are provided for backward compatibility:
+
+``LUA_FOUND``
+  .. deprecated:: 4.2
+    Use ``Lua_FOUND``, which has the same value.
+
+  Boolean indicating whether (the requested version of) Lua was found.
+
+``LUA_VERSION_STRING``
+  .. deprecated:: 4.2
+    Superseded by the ``Lua_VERSION``.
+
+  The version of Lua found.
+
+``LUA_VERSION_MAJOR``
+  .. deprecated:: 4.2
+    Superseded by the ``Lua_VERSION_MAJOR``.
+
+  The major version of Lua found.
+
+``LUA_VERSION_MINOR``
+  .. deprecated:: 4.2
+    Superseded by the ``Lua_VERSION_MINOR``.
+
+  The minor version of Lua found.
+
+``LUA_VERSION_PATCH``
+  .. deprecated:: 4.2
+    Superseded by the ``Lua_VERSION_PATCH``.
+
+  The patch version of Lua found.
+
+Examples
+^^^^^^^^
+
+Finding the Lua library and creating an interface :ref:`imported target
+<Imported Targets>` that encapsulates its usage requirements for linking to a
+project target:
+
+.. code-block:: cmake
+
+  find_package(Lua)
+
+  if(Lua_FOUND AND NOT TARGET Lua::Lua)
+    add_library(Lua::Lua INTERFACE IMPORTED)
+    set_target_properties(
+      Lua::Lua
+      PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${LUA_INCLUDE_DIR}"
+        INTERFACE_LINK_LIBRARIES "${LUA_LIBRARIES}"
+    )
+  endif()
+
+  target_link_libraries(project_target PRIVATE Lua::Lua)
+#]=======================================================================]
+
+cmake_policy(PUSH)  # Policies apply to functions at definition-time
+cmake_policy(SET CMP0140 NEW)
+cmake_policy(SET CMP0159 NEW)  # file(STRINGS) with REGEX updates CMAKE_MATCH_<n>
+
+unset(_lua_include_subdirs)
+unset(_lua_library_names)
+unset(_lua_append_versions)
+
+# this is a function only to have all the variables inside go away automatically
+function(_lua_get_versions)
+    set(LUA_VERSIONS5 5.5 5.4 5.3 5.2 5.1 5.0)
+
+    if (Lua_FIND_VERSION_EXACT)
+        if (Lua_FIND_VERSION_COUNT GREATER 1)
+            set(_lua_append_versions ${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR})
+        endif ()
+    elseif (Lua_FIND_VERSION)
+        # once there is a different major version supported this should become a loop
+        if (NOT Lua_FIND_VERSION_MAJOR GREATER 5)
+            if (Lua_FIND_VERSION_COUNT EQUAL 1)
+                set(_lua_append_versions ${LUA_VERSIONS5})
+            else ()
+                foreach (subver IN LISTS LUA_VERSIONS5)
+                    if (NOT subver VERSION_LESS ${Lua_FIND_VERSION})
+                        list(APPEND _lua_append_versions ${subver})
+                    endif ()
+                endforeach ()
+                # New version -> Search for it (heuristic only! Defines in include might have changed)
+                if (NOT _lua_append_versions)
+                    set(_lua_append_versions ${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR})
+                endif()
+            endif ()
+        endif ()
+    else ()
+        # once there is a different major version supported this should become a loop
+        set(_lua_append_versions ${LUA_VERSIONS5})
+    endif ()
+
+    if (LUA_Debug)
+        message(STATUS "Considering following Lua versions: ${_lua_append_versions}")
+    endif()
+
+    set(_lua_append_versions "${_lua_append_versions}" PARENT_SCOPE)
+endfunction()
+
+function(_lua_set_version_vars)
+  set(_lua_include_subdirs_raw "lua")
+
+  foreach (ver IN LISTS _lua_append_versions)
+    string(REGEX MATCH "^([0-9]+)\\.([0-9]+)$" _ver "${ver}")
+    list(APPEND _lua_include_subdirs_raw
+        lua${CMAKE_MATCH_1}${CMAKE_MATCH_2}
+        lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
+        lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
+        )
+  endforeach ()
+
+  # Prepend "include/" to each path directly after the path
+  set(_lua_include_subdirs "include")
+  foreach (dir IN LISTS _lua_include_subdirs_raw)
+    list(APPEND _lua_include_subdirs "${dir}" "include/${dir}")
+  endforeach ()
+
+  set(_lua_include_subdirs "${_lua_include_subdirs}" PARENT_SCOPE)
+endfunction()
+
+function(_lua_get_header_version)
+  unset(Lua_VERSION PARENT_SCOPE)
+  set(_hdr_file "${LUA_INCLUDE_DIR}/lua.h")
+
+  if (NOT EXISTS "${_hdr_file}")
+    return()
+  endif ()
+
+  # At least 5.[012] have different ways to express the version
+  # so all of them need to be tested. Lua 5.2 defines LUA_VERSION
+  # and LUA_RELEASE as joined by the C preprocessor, so avoid those.
+  file(STRINGS "${_hdr_file}" lua_version_strings
+       REGEX "^#define[ \t]+LUA_(RELEASE[ \t]+\"Lua [0-9]|VERSION([ \t]+\"Lua [0-9]|_[MR])).*")
+
+  string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MAJOR(_N)?[ \t]+\"?([0-9])\"?[ \t]*;.*" "\\2" Lua_VERSION_MAJOR ";${lua_version_strings};")
+
+  if (Lua_VERSION_MAJOR MATCHES "^[0-9]+$")
+    string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MINOR(_N)?[ \t]+\"?([0-9])\"?[ \t]*;.*" "\\2" Lua_VERSION_MINOR ";${lua_version_strings};")
+    string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_RELEASE(_N)?[ \t]+\"?([0-9])\"?[ \t]*;.*" "\\2" Lua_VERSION_PATCH ";${lua_version_strings};")
+    set(Lua_VERSION "${Lua_VERSION_MAJOR}.${Lua_VERSION_MINOR}.${Lua_VERSION_PATCH}")
+  else ()
+    string(REGEX REPLACE ".*;#define[ \t]+LUA_RELEASE[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*" "\\1" Lua_VERSION ";${lua_version_strings};")
+    if (NOT Lua_VERSION MATCHES "^[0-9.]+$")
+      string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*" "\\1" Lua_VERSION ";${lua_version_strings};")
+    endif ()
+    string(REGEX REPLACE "^([0-9]+)\\.[0-9.]*$" "\\1" Lua_VERSION_MAJOR "${Lua_VERSION}")
+    string(REGEX REPLACE "^[0-9]+\\.([0-9]+)[0-9.]*$" "\\1" Lua_VERSION_MINOR "${Lua_VERSION}")
+    string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]).*" "\\1" Lua_VERSION_PATCH "${Lua_VERSION}")
+  endif ()
+  foreach (ver IN LISTS _lua_append_versions)
+    if (ver STREQUAL "${Lua_VERSION_MAJOR}.${Lua_VERSION_MINOR}")
+      set(LUA_VERSION_STRING "${Lua_VERSION}")
+      set(LUA_VERSION_MAJOR "${Lua_VERSION_MAJOR}")
+      set(LUA_VERSION_MINOR "${Lua_VERSION_MINOR}")
+      set(LUA_VERSION_PATCH "${Lua_VERSION_PATCH}")
+
+      return(
+        PROPAGATE
+          Lua_VERSION
+          Lua_VERSION_MAJOR
+          Lua_VERSION_MINOR
+          Lua_VERSION_PATCH
+          LUA_VERSION_STRING
+          LUA_VERSION_MAJOR
+          LUA_VERSION_MINOR
+          LUA_VERSION_PATCH
+      )
+    endif ()
+  endforeach ()
+endfunction()
+
+function(_lua_find_header)
+  _lua_set_version_vars()
+
+  # Initialize as local variable
+  set(CMAKE_IGNORE_PATH ${CMAKE_IGNORE_PATH})
+  while (TRUE)
+    # Find the next header to test. Check each possible subdir in order
+    # This prefers e.g. higher versions as they are earlier in the list
+    # It is also consistent with previous versions of FindLua
+    foreach (subdir IN LISTS _lua_include_subdirs)
+      find_path(LUA_INCLUDE_DIR lua.h
+        HINTS ENV LUA_DIR
+        PATH_SUFFIXES ${subdir}
+        )
+      if (LUA_INCLUDE_DIR)
+        break()
+      endif()
+    endforeach()
+    # Did not found header -> Fail
+    if (NOT LUA_INCLUDE_DIR)
+      return()
+    endif()
+    _lua_get_header_version()
+    # Found accepted version -> Ok
+    if (Lua_VERSION)
+      if (LUA_Debug)
+        message(STATUS "Found suitable version ${Lua_VERSION} in ${LUA_INCLUDE_DIR}/lua.h")
+      endif()
+      return()
+    endif()
+    # Found wrong version -> Ignore this path and retry
+    if (LUA_Debug)
+      message(STATUS "Ignoring unsuitable version in ${LUA_INCLUDE_DIR}")
+    endif()
+    list(APPEND CMAKE_IGNORE_PATH "${LUA_INCLUDE_DIR}")
+    unset(LUA_INCLUDE_DIR CACHE)
+    unset(LUA_INCLUDE_DIR)
+    unset(LUA_INCLUDE_DIR PARENT_SCOPE)
+  endwhile ()
+endfunction()
+
+_lua_get_versions()
+_lua_find_header()
+_lua_get_header_version()
+unset(_lua_append_versions)
+
+if (Lua_VERSION)
+  set(_lua_library_names
+    lua${Lua_VERSION_MAJOR}${Lua_VERSION_MINOR}
+    lua${Lua_VERSION_MAJOR}.${Lua_VERSION_MINOR}
+    lua-${Lua_VERSION_MAJOR}.${Lua_VERSION_MINOR}
+    lua.${Lua_VERSION_MAJOR}.${Lua_VERSION_MINOR}
+    )
+endif ()
+
+find_library(LUA_LIBRARY
+  NAMES ${_lua_library_names} lua
+  NAMES_PER_DIR
+  HINTS
+    ENV LUA_DIR
+  PATH_SUFFIXES lib
+)
+unset(_lua_library_names)
+
+if (LUA_LIBRARY)
+  # include the math library for Unix
+  if (UNIX AND NOT APPLE AND NOT BEOS)
+    find_library(LUA_MATH_LIBRARY m)
+    mark_as_advanced(LUA_MATH_LIBRARY)
+    set(LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}")
+
+    # include dl library for statically-linked Lua library
+    get_filename_component(LUA_LIB_EXT ${LUA_LIBRARY} EXT)
+    if(LUA_LIB_EXT STREQUAL CMAKE_STATIC_LIBRARY_SUFFIX)
+      list(APPEND LUA_LIBRARIES ${CMAKE_DL_LIBS})
+    endif()
+
+  # For Windows and Mac, don't need to explicitly include the math library
+  else ()
+    set(LUA_LIBRARIES "${LUA_LIBRARY}")
+  endif ()
+endif ()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Lua
+                                  REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR
+                                  VERSION_VAR Lua_VERSION)
+
+mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARY)
+
+cmake_policy(POP)

cmake-3.31.7-SHA-256.txt

@@ -1,17 +0,0 @@
-b410959270af66f46943bbae63cf7a3dcde68fb505ceaba4e83f01c4b47d7c28  cmake-3.31.7-files-v1.json
-ce8e32b2c1c497dd7f619124c043ac5c28a88677e390c58748dd62fe460c62a2  cmake-3.31.7-linux-aarch64.sh
-e5b2dc2aefdca10afe09c8fa4ee2bbb4e732665943a94322f99c118781910c3c  cmake-3.31.7-linux-aarch64.tar.gz
-b7a5c909cdafc36042c8c9bd5765e92ff1f2528cf01720aa6dc4df294ec7e1a0  cmake-3.31.7-linux-x86_64.sh
-14e15d0b445dbeac686acc13fe13b3135e8307f69ccf4c5c91403996ce5aa2d4  cmake-3.31.7-linux-x86_64.tar.gz
-22eea0dd50922f7e4a7e112e5606bcb3358617cdc13f512c944c81166babbd16  cmake-3.31.7-macos-universal.dmg
-1cb11aa2edae8551bb0f22807c6f5246bd0eb60ae9fa1474781eb4095d299aca  cmake-3.31.7-macos-universal.tar.gz
-531b551625920d3d5bf128ef5486987978d42d7dd682b3bed98839828c83bf15  cmake-3.31.7-macos10.10-universal.dmg
-f9f8d3e8d06ba1d12e2bda78654d00a78062550a4020917673ce30f733520edd  cmake-3.31.7-macos10.10-universal.tar.gz
-17c564185cf81548bd0164d9d9d341d5ca5c62ba24b68a5c71298ef0c92cb818  cmake-3.31.7-windows-arm64.msi
-5b72d0dcd66dadbbb90789c70789db92302342cc7b91df62059a26e230544f05  cmake-3.31.7-windows-arm64.zip
-1e0b5050c51d4b54edc533386130b847fa39600a3845a660995c77e6e816a4e0  cmake-3.31.7-windows-i386.msi
-9d545715a45efb5fada0e687ec274629c590296037f21181c30ea5c2e079277e  cmake-3.31.7-windows-i386.zip
-f75de311fc36ccdd62976a1d343939b41d5cbcd204e922bb8d0943be3d7dcc7b  cmake-3.31.7-windows-x86_64.msi
-ab1c7f46a1b1314f9fcb766c2573148679af599d94c5566bc12b8b35bb563362  cmake-3.31.7-windows-x86_64.zip
-a6d2eb1ebeb99130dfe63ef5a340c3fdb11431cce3d7ca148524c125924cea68  cmake-3.31.7.tar.gz
-43638d48bc6b6c3356c247486f053f5de2dd5d838e98248e078434a03b1d3e67  cmake-3.31.7.zip

cmake-3.31.7-SHA-256.txt.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmf3zIwACgkQLSzvEDSS
-FoR2LRAAjM1okzohbKOdPIjyPjNKdAcivZ9Epgrer51ZtjATG9HeaGeRTdU0f4jR
-RrkXWO80Z/R9wkw7nM0wWJwtz284jWJI6oqNuLUPEiPc+Hfu5oVn8zEF0s+sqLwv
-FBgcp/zrz+VbPmw3HZLBvr3XmYZ57cN4fln3zT9BkC90dIcxY+e3UwutvHvtaMf4
-PcvA7MXSO5cNzP8eQbUSdxVaHIbQfV9OJoUrFNBNEmW6IQJ+hrOgGAy++DgG0ADu
-BmNkjDHR0LanLno+rr6TMb6XyZnXu99AfdRGpR8lRfkoEXDYwasHj2YlreLJRP/E
-k3Xn0p5HM6Eor68HmFT2+ZHbgRuwgyk9JiCgBIYF1zvli6xBOtkDO1XgNUB74SAa
-Pi1q7HqEfmPqbVAzG+/oBrDyop/E3VmKK6epO/leOGZFL/TjVWgPFVT6MCHk6TMv
-5pyol9vkgCmK3xo8v0I86ncMhH30CWVNTzpqOsc9mVjClLLfMJPEg5SmzUceEUHF
-sEm6ze2TtAP9lmO7SiczMHeJvVNts8YYUU/CZkgTllieXkcmsfGUuGI5Yf2Nz4K3
-EE0bVOxi08bUzGqPA3jy5J6E1h+Jpy6SfSV9pvXXsGCORFsz+mgL/8K2aP2/tp6w
-HI03A8YqAjU9ccAvgQ6UYcWORKvUgMRQzsDBPYst4yOXuED9mo4=
-=Dkjn
------END PGP SIGNATURE-----

cmake-4.1.3-SHA-256.txt

@@ -0,0 +1,21 @@
+366e6782df30d8121b6a352e697d976d561f94bf072ff5eea28b94fd3448d7c2  cmake-4.1.3-files-v1.json
+805faedb9ca51a957249a307e73b4141a1a34b83baa000272b49ddf2c2ae6bd0  cmake-4.1.3-linux-aarch64.sh
+06bb6c4d5d4a31b95ad419a4c8efb88364fa72077ba7a29c909e7b658760f6b3  cmake-4.1.3-linux-aarch64.tar.gz
+0d06fb9e1c5bea523fd88f239327d354e40c00486d1585a68c5e0f1ca0cef7c7  cmake-4.1.3-linux-x86_64.sh
+507e9c721d3a0084df30661c4731980daa18f077fdcc71f7d342a21b07b07920  cmake-4.1.3-linux-x86_64.tar.gz
+c8a8bf120c438a8ace960d6caf22481f9432d23fb5176bef9fb9ab4dfeb5abe8  cmake-4.1.3-macos-universal.dmg
+c49928ef376f563214902d0a9b5de619febc7d3cef9a42b8ce8e208911d3e50b  cmake-4.1.3-macos-universal.tar.gz
+9aaea199c105eac8d2c521807a16193630e903705e758878ac38f87ae6787a57  cmake-4.1.3-macos10.10-universal.dmg
+e6ab486400d51133bc577b055e9e276b121c1bbc6eb84a43c816eaeb628671bd  cmake-4.1.3-macos10.10-universal.tar.gz
+d60dd58498eb1d27e501817069f9059c63784074bfa9937ea8745ad4fac7b125  cmake-4.1.3-sunos-sparc64.sh
+848befcd186746485a86c25f6d4ab47117d8394dbaf539b92abe25c58d67d850  cmake-4.1.3-sunos-sparc64.tar.gz
+95a7a52d424c35444faf0438aff387d155bd1a88ad1a0c7d79cbe7a9c48822f8  cmake-4.1.3-sunos-x86_64.sh
+00c3af5f91f61e23de2619b250c531966df03d0a6803717c63a2bc31679056ea  cmake-4.1.3-sunos-x86_64.tar.gz
+64ec35043c00de01020854cc48c3628af0fbfaaa5ae26bd63b29b1fd547ba43a  cmake-4.1.3-windows-arm64.msi
+4b3ec4917d0d04bf9a83d171f3be552c9214e75597893b40bd10309033265ec5  cmake-4.1.3-windows-arm64.zip
+ec1601a86dcb3ddecec4c548a70c316a80a11e4d04d4b7271a76904a0280a763  cmake-4.1.3-windows-i386.msi
+86165b662284d5c5c43478eff0470d1e9a2ea49602bad5f210e87ade68ba76cf  cmake-4.1.3-windows-i386.zip
+5222342b6575e5016e4e6732a53f764e3e59e2d9caf5881283646bb6a366ddf1  cmake-4.1.3-windows-x86_64.msi
+010d496453fdc5d11f88dbbcc0a5e54c5db7d9e04e008f516087d9d163301d89  cmake-4.1.3-windows-x86_64.zip
+765879a53d178bf1e1509768de4c9a672dabaa20047a9f3809571558e783be88  cmake-4.1.3.tar.gz
+540d8d8ea74c13bf83b367373e071e73d11471c293a68a41084ae6bb02cb61a8  cmake-4.1.3.zip

cmake-4.1.3-SHA-256.txt.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmkckk8ACgkQLSzvEDSS
+FoS1ZQ//Q9YrfNZUiYeZDvXDi35+mTkhvY1YcimAoJ8XirocnQ+AHwsylcI+1agE
+4ikI9hK8nHEwdcfIPUWGVhsjaVgkq5xwYUGhDG8gkqXaiNnj4mrlmhNMGw1i8glL
+xNm+LqMFkKncOiNPK4bug65d1A6NBQN/DclmvIyks/AOJkdS8KxxYxdezeni6S+5
+GTkQTZSKnFdE+Phcg8YUVgjTB+eMu4wSWSR9oXk1AOJ5XY2IClJfwMtds245FsOZ
+UDIxxJ7G9Bghrz41BqmaSdYKSdpXINPDat/98n9MaPB+lrJ0oPfSqmDv0Zy6A/Un
+kzD/EJhQvLuABzXjGsWRs1dKWJCOkUsII+u19MIGkx9nFR6dKb+KExyclC9tlWna
+JRYnB2ZIR3BP+gYFdvdXw9KAlbZMAwWfB91Uxgw1siXQ1jWw2hYUE2FWOFRo7Vcm
+rpg2esGKZIi/BJyNw6s3T9x670gUp0wJnOLsESGvFopGvtdZZ9O/MRrmZvEQ2mHV
+Awfd9YXasA/94NYxHdFIKaUWmqktq4mseiFdrpnKXo6oAO6jmk/dVBVvfkshEMaD
+vWFXthUkG1CRx1UXH8IrO1NUZ//zEew2YC2fwW8kWg1cJIu+M+hxBGM+639LVVnf
+m54yBoww8b3d7eaE8o7xwipHEYJwBt5r45tibCLzceoYngQJZ1E=
+=jdIu
+-----END PGP SIGNATURE-----

cmake-4.1.3.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:765879a53d178bf1e1509768de4c9a672dabaa20047a9f3809571558e783be88
+size 12049989

cmake-findhdf5-prefer-hl-compilers.patch

@@ -1,38 +0,0 @@
-From a869b79c5921412c91fb71a761748ae5f7d3fb23 Mon Sep 17 00:00:00 2001
-From: Atri Bhattacharya <badshah400@gmail.org>
-Date: Mon, 10 Mar 2025 20:55:36 +0530
-Subject: [PATCH] FindHDF5: Prefer h5hl* compilers for HDF5_FIND_HL
-
-Prefer `h5hlcc`, `h5hlc++`, and `h5hlfc` compilers when HDF5's HL libraries
-are requested. These include the `-lhdf_hl` in the command line, whereas
-the non-hl compilers (like `h5cc`) do not. Using the latter, therefore,
-leads to cmake complaining about not finding the `HDF5_HL` libraries even
-though they are present in the same location as the `hdf5` library itself.
-
-Fixes: #23261
----
- Modules/FindHDF5.cmake | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
-index 2f0c3c1665..89058ca2be 100644
---- a/Modules/FindHDF5.cmake
-+++ b/Modules/FindHDF5.cmake
-@@ -218,6 +218,13 @@ else()
-   set(HDF5_Fortran_COMPILER_NAMES h5fc h5pfc)
- endif()
- 
-+# Prefer h5hl<LANG> compilers if HDF5_FIND_HL is enabled
-+if(HDF5_FIND_HL)
-+  list(PREPEND HDF5_C_COMPILER_NAMES h5hlcc)
-+  list(PREPEND HDF5_CXX_COMPILER_NAMES h5hlc++)
-+  list(PREPEND HDF5_Fortran_COMPILER_NAMES h5hlfc)
-+endif()
-+
- # Test first if the current compilers automatically wrap HDF5
- function(_HDF5_test_regular_compiler_C success version is_parallel)
-   if(NOT ${success} OR
--- 
-GitLab
-
-

cmake-fix-ruby-test.patch

@@ -1,13 +1,13 @@
-Index: cmake-3.26.2/Modules/FindRuby.cmake
+Index: cmake-4.0.0/Modules/FindRuby.cmake
 ===================================================================
---- cmake-3.26.2.orig/Modules/FindRuby.cmake
+--- cmake-4.0.0.orig/Modules/FindRuby.cmake
-+++ cmake-3.26.2/Modules/FindRuby.cmake
++++ cmake-4.0.0/Modules/FindRuby.cmake
-@@ -313,7 +313,7 @@ if(Ruby_EXECUTABLE AND NOT Ruby_VERSION_
+@@ -286,7 +286,7 @@ if (Ruby_EXECUTABLE AND NOT Ruby_EXECUTA
    _RUBY_CONFIG_VAR("sitelibdir" Ruby_SITELIB_DIR)
  
    # vendor_ruby available ?
 -  execute_process(COMMAND ${Ruby_EXECUTABLE} -r vendor-specific -e "print 'true'"
 +  execute_process(COMMAND ${Ruby_EXECUTABLE} -r rbconfig -e "print 'true' unless RbConfig::CONFIG['vendorarchdir'].nil?"
-     OUTPUT_VARIABLE Ruby_HAS_VENDOR_RUBY  ERROR_QUIET)
+                   OUTPUT_VARIABLE Ruby_HAS_VENDOR_RUBY ERROR_QUIET)
  
-   if(Ruby_HAS_VENDOR_RUBY)
+   if (Ruby_HAS_VENDOR_RUBY)

cmake.changes

@@ -1,13 +1,134 @@
+-------------------------------------------------------------------
+Wed Jan 28 18:34:55 UTC 2026 - Matej Cepl <mcepl@cepl.eu>
+
+- Add the modern version of Modules/FindLua.cmake from
+  https://gitlab.kitware.com/cmake/cmake/-/blob/261b7b933c66/Modules/FindLua.cmake,
+  which works with Lua 5.5
+
+-------------------------------------------------------------------
+Tue Dec  2 19:39:27 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- update to 4.1.3:
+  * The execute_process() command once again terminates child
+    processes when its TIMEOUT is reached. This was accidentally
+    regressed by CMake 3.29.
+- fixes test failures with libarchive >= 3.8.2 (boo#1253745)
+
+-------------------------------------------------------------------
+Thu Oct  2 05:45:56 UTC 2025 - Christoph G <foss@grueninger.de>
+
+- update to 4.1.2.
+  * Ninja: escape special characters in custom command comments
+  * GNUInstallDirs: Fix regression on -DCMAKE_INSTALL_<dir>=<default> in /usr
+  * FindPython: Ensure correct handling of Python_FIND_ABI variable
+- remove avoid-using-undocumented-type.patch part of upstream
+
+-------------------------------------------------------------------
+Tue Sep 30 07:25:15 UTC 2025 - Dirk Müller <dmueller@suse.com>
+
+- add avoid-using-undocumented-type.patch to fix build with curl
+  8.16
+- disable lto as there are two byacc definitions in two different
+  compilation units and they conflict.
+
+-------------------------------------------------------------------
+Fri Aug 29 07:59:32 UTC 2025 - Christoph G <foss@grueninger.de>
+
+- Update to 4.1.1
+ * ctest: Restore default of no time limit for command-line `-T
+   Test` step
+ * ctest: Restore default test timeout for command-line `-T Test`
+   step
+ * cmList: fix swap function definition
+ * string(GENEX_STRIP): Fix regression on nested generator
+   expressions
+ * Clang/CUDA: Support CUDA Toolkit 13 new include layout
+
+-------------------------------------------------------------------
+Thu Aug  7 20:43:08 UTC 2025 - Christoph G <foss@grueninger.de>
+
+- Update to CMake 4.1.0
+  * The "cmake-configure-log(7)" now reports events from
+    "find_package()" (in "CONFIG" mode), "find_path()",
+    "find_file()", "find_library()", and "find_program()" commands
+    when first invoked, when their results transition between "not
+    found" and "found".
+  * The "cmake_pkg_config()" command now supports the "IMPORT" and
+    "POPULATE" subcommands for interfacing CMake targets with
+    pkg-config based dependencies.
+  * The "CMAKE_FIND_REQUIRED" variable was added to tell
+    "find_package()", "find_path()", "find_file()",
+    "find_library()", and "find_program()" to be "REQUIRED" by
+    default.
+  * The "FindBLAS" and "FindLAPACK" modules now support the NVIDIA
+    Performance Libraries (NVPL).
+  * The "string(REGEX MATCHALL)", "string(REGEX REPLACE)", and
+    "list(TRANSFORM REPLACE)" commands now match the regular
+    expression "^" anchor at most once in repeated searches, at the
+    start of the input. See policy "CMP0186".
+  * The "TARGET_PROPERTY" generator expression now evaluates the
+    "LINK_LIBRARIES" and "INTERFACE_LINK_LIBRARIES" target properties
+    transitively.  See policy "CMP0189".
+- Remove cmake-findhdf5-prefer-hl-compilers.patch, part of upstream
+
+-------------------------------------------------------------------
+Wed Jun 18 12:04:17 UTC 2025 - Simon Lees <sflees@suse.de>
+
+- Set -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to fix a bunch of build
+  issues.
+
+-------------------------------------------------------------------
+Mon Jun 16 21:14:47 UTC 2025 - Christoph G <foss@grueninger.de>
+
+- update to 4.0.3
+  * CUDA/Clang: Fix list of architectures supported by Clang < 20.1,
+    Reorder the logic for setting supported archs, add archs
+    supported by Clang 21
+  * gcc: support `import std`
+  * experimental: recycle the `import std` UUID
+  * Clang/CXXImportStd: support `-stdlib=libstdc++`
+  * experimental/CXXModules: recycle the UUID
+  * FindPython: rely on ABIFLAGS on Windows for ABI profile
+  * FindPython: Avoid implicit link library on Windows
+
 -------------------------------------------------------------------
 Wed May 28 18:49:13 UTC 2025 - Bernhard Wiedemann <bwiedemann@suse.com>
- 
+
  - Replace usage of %jobs for reproducible builds (boo#1237231)
- 
+
 -------------------------------------------------------------------
 Tue May 20 20:45:39 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
 
 - fix GUI build on openSUSE Leap 15.x
 
+-------------------------------------------------------------------
+Wed Apr 16 21:31:21 UTC 2025 - Christoph G <foss@grueninger.de>
+
+- update to 4.0.1
+  * get_filename_component: Restore lexical preprocessing of
+    REALPATH for compat
+  * find_package: Restore component requirements in nested calls
+  * Source: Include specific CoreFoundation headers instead of
+    umbrella header
+
+-------------------------------------------------------------------
+Tue Apr 16 17:27:57 UTC 2025 - Christoph G <foss@grueninger.de>
+
+- update to CMake 4.0
+  * The "CMAKE_POLICY_VERSION_MINIMUM" variable was added to help
+    packagers and end users try to configure existing projects that
+    have not been updated to work with supported CMake versions.
+  * The "$<PATH>" generator expression gained the "NATIVE_PATH"
+    operation to convert a CMake path into a native one.
+  * Compatibility with versions of CMake older than 3.5 has been
+    removed.
+  * The "cmake --link-no-warning-as-error" option was added to
+    suppress the effects of the "LINK_WARNING_AS_ERROR" target
+    property and "CMAKE_LINK_WARNING_AS_ERROR" variable.
+  * The "target_link_libraries()" command now supports the
+    "LINKER:" prefix.
+- adjust cmake-fix-ruby-test.patch
+
 -------------------------------------------------------------------
 Fri Apr 11 15:23:54 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
 

cmake.macros

@@ -57,7 +57,8 @@
         -DBUILD_STATIC_LIBS:BOOL=OFF \\\
         -DCMAKE_COLOR_MAKEFILE:BOOL=OFF \\\
         -DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\
-        -DCMAKE_MODULES_INSTALL_DIR=%{_libdir}/cmake/%{name}
+        -DCMAKE_MODULES_INSTALL_DIR=%{_libdir}/cmake/%{name} \\\
+        -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 
 %__builder_verbose \
 %if "%__builder" == "%__make" \

cmake.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package cmake
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 # Copyright (c) 2025 Andreas Stieger <Andreas.Stieger@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
@@ -45,32 +45,32 @@
 %else
 %bcond_with full
 %endif
-%define shortversion 3.31
 %if 0%{?suse_version} && 0%{?suse_version} <= 1500
 %define pyver 311
 %else
 %define pyver 3
 %endif
 Name:           cmake%{?psuffix}
-Version:        3.31.7
+Version:        4.1.3
 Release:        0
 Summary:        Cross-platform make system
 License:        BSD-3-Clause
 URL:            https://www.cmake.org/
-Source0:        https://www.cmake.org/files/v%{shortversion}/cmake-%{version}.tar.gz
+Source0:        https://github.com/Kitware/CMake/releases/download/v%{version}/cmake-%{version}.tar.gz
 Source1:        cmake.macros
 # bnc#947585 - Let CMake produces automatic RPM provides
 Source3:        cmake.attr
 Source4:        cmake.prov
-Source5:        https://www.cmake.org/files/v%{shortversion}/cmake-%{version}-SHA-256.txt
+Source5:        https://github.com/Kitware/CMake/releases/download/v%{version}/cmake-%{version}-SHA-256.txt
-Source6:        https://www.cmake.org/files/v%{shortversion}/cmake-%{version}-SHA-256.txt.asc
+Source6:        https://github.com/Kitware/CMake/releases/download/v%{version}/cmake-%{version}-SHA-256.txt.asc
 Source7:        cmake.keyring
+# Work with Lua 5.5
+# https://gitlab.kitware.com/cmake/cmake/-/blob/261b7b933c66/Modules/FindLua.cmake
+Source50:       FindLua.cmake
 Source99:       README.SUSE
 Patch0:         cmake-fix-ruby-test.patch
 # Search for python interpreters from newest to oldest rather then picking up /usr/bin/python as first choice
 Patch1:         feature-suse-python-interp-search-order.patch
-# PATCH-FIX-UPSTREAM cmake-findhdf5-prefer-hl-compilers.patch badshah400@gmail.com -- FindHDF5: Prefer h5hl* compilers for HDF5_FIND_HL; patch submitted upstream [https://gitlab.kitware.com/cmake/cmake/-/merge_requests/10450.patch]
-Patch2:         cmake-findhdf5-prefer-hl-compilers.patch
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig
@@ -152,6 +152,9 @@ CMake documentation for offline reading - qhelp version.
 echo "`grep cmake-%{version}.tar.gz %{SOURCE5} | grep -Eo '^[0-9a-f]+'`  %{SOURCE0}" | sha256sum -c
 %autosetup -p1 -n cmake-%{version}
 
+# Use modern FindLua.cmake capable of working with Lua 5.5
+cp %{SOURCE50} ./Modules/FindLua.cmake
+
 %build
 cp -p %{SOURCE99} .
 %if %{with qhelp}
@@ -161,8 +164,8 @@ export PATH+=":%{_qt6_libexecdir}"
 %if %{with mini}
 # this is serial, so it takes too much time for the mini package
 %define _find_debuginfo_dwz_opts %{nil}
-%define _lto_cflags %{nil}
 %endif
+%define _lto_cflags %{nil}
 export CFLAGS="%{optflags}"
 export CXXFLAGS="$CFLAGS"
 %if %{with gui}
@@ -237,9 +240,6 @@ install -p -m0644 -D %{SOURCE3} %{buildroot}%{_fileattrsdir}/cmake.attr
 install -p -m0755 -D %{SOURCE4} %{buildroot}%{_rpmconfigdir}/cmake.prov
 sed -i -e "1s@#!.*python.*@#!$(realpath %{_bindir}/python3)@" %{buildroot}%{_rpmconfigdir}/cmake.prov
 
-# fix: W: files-duplicate  (%%license covers already)
-rm %{buildroot}%{_docdir}/cmake/Copyright.txt
-
 %fdupes %{buildroot}%{_datadir}/cmake
 %endif
 %endif
@@ -257,13 +257,11 @@ rm %{buildroot}%{_docdir}/cmake/Copyright.txt
 
 %if %{with qhelp}
 %files -n cmake-doc-qhelp
-%license Copyright.txt
 %{_docdir}/cmake/CMake.qch
 %endif
 
 %if %{with gui}
 %files -n cmake-gui
-%license Copyright.txt
 %{_bindir}/cmake-gui
 %{_datadir}/applications/cmake-gui.desktop
 %{_datadir}/mime/packages/cmakecache.xml
@@ -274,7 +272,6 @@ rm %{buildroot}%{_docdir}/cmake/Copyright.txt
 %{_datadir}/icons/hicolor/32x32/apps/CMakeSetup.png
 
 %files -n cmake-man
-%license Copyright.txt
 %{_mandir}/man7/*
 %{_mandir}/man1/*
 
@@ -284,7 +281,6 @@ rm %{buildroot}%{_docdir}/cmake/Copyright.txt
 %if "%{flavor}" == ""
 %doc README.SUSE
 %else
-%license Copyright.txt
 %doc README.rst
 %{_rpmconfigdir}/macros.d/macros.cmake
 %{_fileattrsdir}/cmake.attr

feature-suse-python-interp-search-order.patch

@@ -1,8 +1,12 @@
-Index: cmake-3.27.7/Modules/FindPythonInterp.cmake
+---
+ Modules/FindPythonInterp.cmake |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+Index: cmake-4.1.3/Modules/FindPythonInterp.cmake
 ===================================================================
---- cmake-3.27.7.orig/Modules/FindPythonInterp.cmake
+--- cmake-4.1.3.orig/Modules/FindPythonInterp.cmake	2025-11-18 15:55:48.000000000 +0100
-+++ cmake-3.27.7/Modules/FindPythonInterp.cmake
++++ cmake-4.1.3/Modules/FindPythonInterp.cmake	2026-01-28 16:44:12.726637412 +0100
-@@ -105,8 +105,9 @@ if(DEFINED PYTHONLIBS_VERSION_STRING)
+@@ -138,8 +138,9 @@
    list(GET _PYTHONLIBS_VERSION 1 _PYTHONLIBS_VERSION_MINOR)
    list(APPEND _Python_VERSIONS ${_PYTHONLIBS_VERSION_MAJOR}.${_PYTHONLIBS_VERSION_MINOR})
  endif()