Merge pull request #741 from crazywhalecc/fix/freetype-cmake

force minimum version 3.5 for cmake policies in freetype

Author: henderkes

src/SPC/builder/unix/library/freetype.php

@@ -18,16 +18,20 @@ trait freetype
      */
     protected function build(): void
     {
-        $extra_libs = $this->builder->getLib('libpng') ? '-DFT_DISABLE_PNG=OFF ' : '-DFT_DISABLE_PNG=ON ';
-        $extra_libs .= $this->builder->getLib('bzip2') ? '-DFT_DISABLE_BZIP2=OFF ' : '-DFT_DISABLE_BZIP2=ON ';
-        $extra_libs .= $this->builder->getLib('brotli') ? '-DFT_DISABLE_BROTLI=OFF ' : '-DFT_DISABLE_BROTLI=ON ';
+        $extra = '';
+        if (version_compare(get_cmake_version(), '4.0.0', '>=')) {
+            $extra .= '-DCMAKE_POLICY_VERSION_MINIMUM=3.12 ';
+        }
+        $extra .= $this->builder->getLib('libpng') ? '-DFT_DISABLE_PNG=OFF ' : '-DFT_DISABLE_PNG=ON ';
+        $extra .= $this->builder->getLib('bzip2') ? '-DFT_DISABLE_BZIP2=OFF ' : '-DFT_DISABLE_BZIP2=ON ';
+        $extra .= $this->builder->getLib('brotli') ? '-DFT_DISABLE_BROTLI=OFF ' : '-DFT_DISABLE_BROTLI=ON ';
         FileSystem::resetDir($this->source_dir . '/build');
         shell()->cd($this->source_dir . '/build')
             ->setEnv(['CFLAGS' => $this->getLibExtraCFlags(), 'LDFLAGS' => $this->getLibExtraLdFlags(), 'LIBS' => $this->getLibExtraLibs()])
             ->execWithEnv(
                 "cmake {$this->builder->makeCmakeArgs()} -DFT_DISABLE_HARFBUZZ=ON " .
                 '-DBUILD_SHARED_LIBS=OFF ' .
-                "{$extra_libs}.."
+                "{$extra}.."
             )
             ->execWithEnv('make clean')
             ->execWithEnv("make -j{$this->builder->concurrency}")

src/SPC/doctor/item/LinuxToolCheckList.php

@@ -87,17 +87,14 @@ public function checkCliTools(): ?CheckResult
     #[AsCheckItem('if cmake version >= 3.18', limit_os: 'Linux')]
     public function checkCMakeVersion(): ?CheckResult
     {
-        $check_cmd = 'cmake --version';
-        $pattern = '/cmake version (.*)/m';
-        $out = shell()->execWithResult($check_cmd, false)[1][0];
-        if (preg_match($pattern, $out, $match)) {
-            $ver = $match[1];
-            if (version_compare($ver, '3.18.0') <= 0) {
-                return CheckResult::fail('cmake version is too low (' . $ver . '), please update it manually!');
-            }
-            return CheckResult::ok($match[1]);
+        $ver = get_cmake_version();
+        if ($ver === null) {
+            return CheckResult::fail('Failed to get cmake version');
+        }
+        if (version_compare($ver, '3.18.0') < 0) {
+            return CheckResult::fail('cmake version is too low (' . $ver . '), please update it manually!');
         }
-        return CheckResult::fail('Failed to get cmake version');
+        return CheckResult::ok($ver);
     }
 
     /** @noinspection PhpUnused */

src/globals/functions.php

@@ -192,3 +192,21 @@ function f_putenv(string $env): bool
     logger()->debug('Setting env: ' . $env);
     return putenv($env);
 }
+
+/**
+ * Get the installed CMake version
+ *
+ * @return null|string The CMake version or null if it couldn't be determined
+ */
+function get_cmake_version(): ?string
+{
+    try {
+        [,$output] = shell()->execWithResult('cmake --version', false);
+        if (preg_match('/cmake version ([\d.]+)/i', $output[0], $matches)) {
+            return $matches[1];
+        }
+    } catch (Exception $e) {
+        logger()->warning('Failed to get CMake version: ' . $e->getMessage());
+    }
+    return null;
+}

src/globals/test-extensions.php

@@ -13,17 +13,17 @@
 
 // test php version (8.1 ~ 8.4 available, multiple for matrix)
 $test_php_version = [
-    // '8.1',
-    // '8.2',
-    // '8.3',
+    '8.1',
+    '8.2',
+    '8.3',
     '8.4',
 ];
 
 // test os (macos-13, macos-14, macos-15, ubuntu-latest, windows-latest are available)
 $test_os = [
     // 'macos-13',
     // 'macos-14',
-    'macos-15',
+    // 'macos-15',
     'ubuntu-latest',
     // 'ubuntu-22.04',
     // 'ubuntu-24.04',