Skip to content

Commit aedcc86

Browse files
committed
fix cmake minimum version for libtidy
1 parent 978975d commit aedcc86

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

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

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,13 @@ trait libxml2
1717
public function build(): void
1818
{
1919
$cmake = UnixCMakeExecutor::create($this)
20-
->optionalLib('zlib', "-DLIBXML2_WITH_ZLIB=ON -DZLIB_LIBRARY={$this->getLibDir()}/libz.a -DZLIB_INCLUDE_DIR={$this->getIncludeDir()}", '-DLIBXML2_WITH_ZLIB=OFF')
20+
->optionalLib(
21+
'zlib',
22+
'-DLIBXML2_WITH_ZLIB=ON ' .
23+
"-DZLIB_LIBRARY={$this->getLibDir()}/libz.a " .
24+
"-DZLIB_INCLUDE_DIR={$this->getIncludeDir()}",
25+
'-DLIBXML2_WITH_ZLIB=OFF',
26+
)
2127
->optionalLib('icu', ...cmake_boolean_args('LIBXML2_WITH_ICU'))
2228
->optionalLib('xz', ...cmake_boolean_args('LIBXML2_WITH_LZMA'))
2329
->addConfigureArgs(
@@ -35,8 +41,13 @@ public function build(): void
3541

3642
FileSystem::replaceFileStr(
3743
BUILD_LIB_PATH . '/pkgconfig/libxml-2.0.pc',
38-
'-licudata -licui18n -licuuc',
39-
'-licui18n -licuuc -licudata'
44+
'-lxml2 -liconv',
45+
'-lxml2'
46+
);
47+
FileSystem::replaceFileStr(
48+
BUILD_LIB_PATH . '/pkgconfig/libxml-2.0.pc',
49+
'-lxml2',
50+
'-lxml2 -liconv'
4051
);
4152
}
4253
}

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,16 @@ trait tidy
1616
*/
1717
protected function build(): void
1818
{
19-
UnixCMakeExecutor::create($this)
19+
$cmake = UnixCMakeExecutor::create($this)
2020
->setBuildDir("{$this->source_dir}/build-dir")
2121
->addConfigureArgs(
2222
'-DSUPPORT_CONSOLE_APP=OFF',
2323
'-DBUILD_SHARED_LIB=OFF'
24-
)
25-
->build();
24+
);
25+
if (version_compare(get_cmake_version(), '4.0.0', '>=')) {
26+
$cmake->addConfigureArgs('-DCMAKE_POLICY_VERSION_MINIMUM=3.5');
27+
}
28+
$cmake->build();
2629
$this->patchPkgconfPrefix(['tidy.pc']);
2730
}
2831
}

0 commit comments

Comments
 (0)