From bb37c0058e5665ab5521608ee2ba2ff77240cc28 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Mon, 9 Jun 2025 12:49:33 +0800 Subject: [PATCH] Fix CMake related options --- src/SPC/builder/unix/library/curl.php | 2 +- src/SPC/builder/unix/library/libaom.php | 2 +- src/SPC/builder/unix/library/libevent.php | 1 - src/SPC/util/executor/UnixCMakeExecutor.php | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/SPC/builder/unix/library/curl.php b/src/SPC/builder/unix/library/curl.php index ea8b6320..0d0b8d8d 100644 --- a/src/SPC/builder/unix/library/curl.php +++ b/src/SPC/builder/unix/library/curl.php @@ -19,7 +19,7 @@ trait curl shell()->cd($this->source_dir)->exec('sed -i.save s@\${CMAKE_C_IMPLICIT_LINK_LIBRARIES}@@ ./CMakeLists.txt'); UnixCMakeExecutor::create($this) - ->optionalLib('openssl', '-DCURL_USE_OPENSSL=ON -DCURL_CA_BUNDLE=OFF -DCURL_CA_PATH=OFF -DCURL_FALLBACK=ON', '-DCURL_USE_OPENSSL=OFF -DCURL_ENABLE_SSL=OFF') + ->optionalLib('openssl', '-DCURL_USE_OPENSSL=ON -DCURL_CA_BUNDLE=OFF -DCURL_CA_PATH=OFF -DCURL_CA_FALLBACK=ON', '-DCURL_USE_OPENSSL=OFF -DCURL_ENABLE_SSL=OFF') ->optionalLib('brotli', ...cmake_boolean_args('CURL_BROTLI')) ->optionalLib('libssh2', fn ($lib) => "-DLIBSSH2_LIBRARY=\"{$lib->getStaticLibFiles(style: 'cmake')}\" -DLIBSSH2_INCLUDE_DIR={$lib->getIncludeDir()}", '-DCURL_USE_LIBSSH2=OFF') ->optionalLib('nghttp2', fn ($lib) => "-DUSE_NGHTTP2=ON -DNGHTTP2_LIBRARY=\"{$lib->getStaticLibFiles(style: 'cmake')}\" -DNGHTTP2_INCLUDE_DIR={$lib->getIncludeDir()}", '-DUSE_NGHTTP2=OFF') diff --git a/src/SPC/builder/unix/library/libaom.php b/src/SPC/builder/unix/library/libaom.php index 57129389..ab5c22b8 100644 --- a/src/SPC/builder/unix/library/libaom.php +++ b/src/SPC/builder/unix/library/libaom.php @@ -18,7 +18,7 @@ trait libaom { UnixCMakeExecutor::create($this) ->setBuildDir("{$this->source_dir}/builddir") - ->addConfigureArgs('-DAOM_TARGET_GPU=generic') + ->addConfigureArgs('-DAOM_TARGET_CPU=generic') ->build(); $this->patchPkgconfPrefix(['aom.pc']); } diff --git a/src/SPC/builder/unix/library/libevent.php b/src/SPC/builder/unix/library/libevent.php index 04c35d18..da726935 100644 --- a/src/SPC/builder/unix/library/libevent.php +++ b/src/SPC/builder/unix/library/libevent.php @@ -45,7 +45,6 @@ trait libevent '-DEVENT__LIBRARY_TYPE=STATIC', '-DEVENT__DISABLE_BENCHMARK=ON', '-DEVENT__DISABLE_THREAD_SUPPORT=ON', - '-DEVENT__DISABLE_MBEDTLS=ON', '-DEVENT__DISABLE_TESTS=ON', '-DEVENT__DISABLE_SAMPLES=ON', ) diff --git a/src/SPC/util/executor/UnixCMakeExecutor.php b/src/SPC/util/executor/UnixCMakeExecutor.php index 71319fa0..91d6e313 100644 --- a/src/SPC/util/executor/UnixCMakeExecutor.php +++ b/src/SPC/util/executor/UnixCMakeExecutor.php @@ -143,7 +143,7 @@ class UnixCMakeExecutor extends Executor "-DCMAKE_INSTALL_PREFIX={$this->library->getBuildRootPath()}", '-DCMAKE_INSTALL_BINDIR=bin', '-DCMAKE_INSTALL_LIBDIR=lib', - '-DCMAKE_INSTALL_INCLUDE_DIR=include', + '-DCMAKE_INSTALL_INCLUDEDIR=include', '-DBUILD_SHARED_LIBS=OFF', "-DCMAKE_TOOLCHAIN_FILE={$this->makeCmakeToolchainFile()}", ]);