CMake: Update to >= 3.25

- Update the minimum required CMake version to 3.25
- Use `cmake_path` for more robust path handling during header installation
- Remove custom FetchContent macro
- Switch the Zlib dependency to explicitly use ZLIB::ZLIBSTATIC
- Disable building documentation for libunwind
- Adjust policies to reflect the newer version

Drive-by: Fix a copy-and-paste typo in `ubuntu-cmake.yml`
PiperOrigin-RevId: 903803386
Change-Id: I73e798482156a53f24e79a66c14194747040537f

Author: cblichmann

.github/workflows/ubuntu-cmake.yml

@@ -57,7 +57,7 @@ jobs:
           clang-${{matrix.compiler-version}} \
           libclang-${{matrix.libclang-version}}-dev \
           libclang-rt-${{matrix.libclang-version}}-dev \
-          llvm-${{matrix.libclang-version}}-dev \
+          llvm-${{matrix.libclang-version}}-dev
         echo "CXX=clang++-${{matrix.compiler-version}}" >> $GITHUB_ENV
         echo "CC=clang-${{matrix.compiler-version}}" >> $GITHUB_ENV
 
@@ -68,7 +68,7 @@ jobs:
           g++-${{matrix.compiler-version}} \
           libclang-${{matrix.libclang-version}}-dev \
           libclang-rt-${{matrix.libclang-version}}-dev \
-          llvm-${{matrix.libclang-version}}-dev \
+          llvm-${{matrix.libclang-version}}-dev
         echo "CXX=g++-${{matrix.compiler-version}}" >> $GITHUB_ENV
         echo "CC=gcc-${{matrix.compiler-version}}" >> $GITHUB_ENV
 

CMakeLists.txt

@@ -12,14 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.13..3.26)
+cmake_minimum_required(VERSION 3.25..4.2)
 
 if(POLICY CMP0083)
   cmake_policy(SET CMP0083 NEW)  # Add PIE flags when requested
 endif()
 
-if(POLICY CMP0135)
-  cmake_policy(SET CMP0135 NEW)  # Set download timestamp to current time
+if(POLICY CMP0177)
+  cmake_policy(SET CMP0177 NEW)  # Normalize install() paths
 endif()
 
 project(SandboxedAPI C CXX ASM)

cmake/SapiDeps.cmake

@@ -19,7 +19,7 @@ function(sapi_check_target target)
   endif()
 endfunction()
 
-include(SapiFetchContent)
+include(FetchContent)
 
 # Use static libraries
 set(_sapi_saved_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
@@ -92,7 +92,7 @@ sapi_check_target(re2)
 if(SAPI_BUILD_EXAMPLES)
   if(SAPI_DOWNLOAD_ZLIB)
     include(cmake/zlib.cmake)
-    sapi_check_target(ZLIB::ZLIB)
+    sapi_check_target(ZLIB::ZLIBSTATIC)
   else()
     find_package(ZLIB REQUIRED)
   endif()

cmake/SapiFetchContent.cmake

@@ -27,6 +27,7 @@ if(NOT libunwind_POPULATED)
     message("-- Running ./configure for libunwind...")
     execute_process(
       COMMAND ./configure --disable-dependency-tracking
+                          --disable-documentation
                           --disable-minidebuginfo
                           --disable-shared
                           --enable-ptrace

cmake/libunwind.cmake

@@ -20,4 +20,3 @@ FetchContent_MakeAvailable(zlib)
 
 set(ZLIB_FOUND TRUE)
 set(ZLIB_INCLUDE_DIRS ${zlib_SOURCE_DIR})
-add_library(ZLIB::ZLIB ALIAS zlibstatic)

cmake/zlib.cmake

@@ -403,8 +403,8 @@ endforeach()
 file(GLOB_RECURSE _sapi_headers true ${CMAKE_CURRENT_LIST_DIR}/*.h)
 list(FILTER _sapi_headers EXCLUDE REGEX /\(tools|examples\)/)
 foreach(_file ${_sapi_headers})
-  get_filename_component(_dir ${_file} DIRECTORY)
-  string(REPLACE ${CMAKE_CURRENT_LIST_DIR} "" _dir ${_dir})
+  cmake_path(GET _file PARENT_PATH _dir)
+  cmake_path(RELATIVE_PATH _dir BASE_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
   install(FILES ${_file}
           DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sandboxed_api/${_dir})
 endforeach()

sandboxed_api/CMakeLists.txt

@@ -24,7 +24,7 @@ add_sapi_library(zlib-sapi
 )
 add_library(sapi::zlib_sapi ALIAS zlib-sapi)
 target_link_libraries(zlib-sapi PRIVATE
-  ZLIB::ZLIB
+  ZLIB::ZLIBSTATIC
 )
 
 # sandboxed_api/examples/zlib:main_zlib

sandboxed_api/examples/zlib/CMakeLists.txt

@@ -45,5 +45,5 @@ set_target_properties(sandbox2_zpipe PROPERTIES OUTPUT_NAME zpipe)
 add_executable(sandbox2::zpipe ALIAS sandbox2_zpipe)
 target_link_libraries(sandbox2_zpipe PRIVATE
   -static
-  ZLIB::ZLIB
+  ZLIB::ZLIBSTATIC
 )