diff options
| author | ojab ojab <gitlab.kitware.com@ojab.ru> | 2024-07-21 21:05:15 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-07-22 14:33:50 (GMT) |
| commit | 35eb28bc76da8501c344b0e0e3320ce51a495383 (patch) | |
| tree | a9f4a3cbbb693595168efc801bfb006b843ccc91 | |
| parent | 089e946399fc9c6b43a861a2f630ad0b6eccef25 (diff) | |
| download | CMake-35eb28bc76da8501c344b0e0e3320ce51a495383.zip CMake-35eb28bc76da8501c344b0e0e3320ce51a495383.tar.gz CMake-35eb28bc76da8501c344b0e0e3320ce51a495383.tar.bz2 | |
bootstrap: Restore support for system jsoncpp and uv without pkg-config
In commit da5de7f9f3 (bootstrap: Allow --boostrap-system-* libraries
custom prefixes, 2024-03-03, v3.30.0-rc1~456^2) the non-pkg-config code
path for uv/jsoncpp/rhash all set `use_librhash_ldflags` instead of
their own variable.
| -rwxr-xr-x | bootstrap | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1811,7 +1811,7 @@ else cmake_c_flags="${cmake_c_flags} ${use_uv_flags}" cmake_cxx_flags="${cmake_cxx_flags} ${use_uv_flags}" else - use_librhash_ldflags="-luv" + use_uv_ldflags="-luv" fi libs="${libs} ${use_uv_ldflags}" fi @@ -1838,7 +1838,7 @@ else use_jsoncpp_ldflags="`pkg-config --libs jsoncpp`" cmake_cxx_flags="${cmake_cxx_flags} ${use_jsoncpp_flags}" else - use_librhash_ldflags="-ljsoncpp" + use_jsoncpp_ldflags="-ljsoncpp" fi libs="${libs} ${use_jsoncpp_ldflags}" fi |