Skip to content

Commit bb37c00

Browse files
committed
Fix CMake related options
1 parent f4e1d7d commit bb37c00

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ protected function build(): void
1919
shell()->cd($this->source_dir)->exec('sed -i.save s@\${CMAKE_C_IMPLICIT_LINK_LIBRARIES}@@ ./CMakeLists.txt');
2020

2121
UnixCMakeExecutor::create($this)
22-
->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')
22+
->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')
2323
->optionalLib('brotli', ...cmake_boolean_args('CURL_BROTLI'))
2424
->optionalLib('libssh2', fn ($lib) => "-DLIBSSH2_LIBRARY=\"{$lib->getStaticLibFiles(style: 'cmake')}\" -DLIBSSH2_INCLUDE_DIR={$lib->getIncludeDir()}", '-DCURL_USE_LIBSSH2=OFF')
2525
->optionalLib('nghttp2', fn ($lib) => "-DUSE_NGHTTP2=ON -DNGHTTP2_LIBRARY=\"{$lib->getStaticLibFiles(style: 'cmake')}\" -DNGHTTP2_INCLUDE_DIR={$lib->getIncludeDir()}", '-DUSE_NGHTTP2=OFF')

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ protected function build(): void
1818
{
1919
UnixCMakeExecutor::create($this)
2020
->setBuildDir("{$this->source_dir}/builddir")
21-
->addConfigureArgs('-DAOM_TARGET_GPU=generic')
21+
->addConfigureArgs('-DAOM_TARGET_CPU=generic')
2222
->build();
2323
$this->patchPkgconfPrefix(['aom.pc']);
2424
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ protected function build(): void
4545
'-DEVENT__LIBRARY_TYPE=STATIC',
4646
'-DEVENT__DISABLE_BENCHMARK=ON',
4747
'-DEVENT__DISABLE_THREAD_SUPPORT=ON',
48-
'-DEVENT__DISABLE_MBEDTLS=ON',
4948
'-DEVENT__DISABLE_TESTS=ON',
5049
'-DEVENT__DISABLE_SAMPLES=ON',
5150
)

src/SPC/util/executor/UnixCMakeExecutor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ private function getDefaultCMakeArgs(): string
143143
"-DCMAKE_INSTALL_PREFIX={$this->library->getBuildRootPath()}",
144144
'-DCMAKE_INSTALL_BINDIR=bin',
145145
'-DCMAKE_INSTALL_LIBDIR=lib',
146-
'-DCMAKE_INSTALL_INCLUDE_DIR=include',
146+
'-DCMAKE_INSTALL_INCLUDEDIR=include',
147147
'-DBUILD_SHARED_LIBS=OFF',
148148
"-DCMAKE_TOOLCHAIN_FILE={$this->makeCmakeToolchainFile()}",
149149
]);

0 commit comments

Comments
 (0)