Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-14 02:08:27 +08:00
Code Issues Projects Releases Wiki Activity

bootstrap: Restore support for system jsoncpp and uv without pkg-config

Browse Source 
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.
This commit is contained in:
ojab ojab
2024-07-21 17:05:15 -04:00
committed by Brad King
parent 089e946399
commit 35eb28bc76
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bootstrap
View File

@@ -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