diff options
| author | Brad King <brad.king@kitware.com> | 2024-07-23 13:52:00 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-07-23 13:52:09 (GMT) |
| commit | 6ed2c348f230e004aee469ca4f4c9242405b0fbf (patch) | |
| tree | 049655c84617d46dca08d33c795ee525eb5126bd /bootstrap | |
| parent | da9d533fa77a83045674ef2b89d722b2936683a5 (diff) | |
| parent | 35eb28bc76da8501c344b0e0e3320ce51a495383 (diff) | |
| download | CMake-6ed2c348f230e004aee469ca4f4c9242405b0fbf.zip CMake-6ed2c348f230e004aee469ca4f4c9242405b0fbf.tar.gz CMake-6ed2c348f230e004aee469ca4f4c9242405b0fbf.tar.bz2 | |
Merge topic 'bootstrap-no-pkg-config'
35eb28bc76 bootstrap: Restore support for system jsoncpp and uv without pkg-config
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Turbov <i.zaufi@gmail.com>
Merge-request: !9679
Diffstat (limited to 'bootstrap')
| -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 |