echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge topic 'bootstrap-no-pkg-config'

Browse Source 
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
This commit is contained in:
Brad King 2024-07-23 13:52:00 +00:00 committed by Kitware Robot
commit 6ed2c348f2
1 changed files with 2 additions and 2 deletions
Show Stats 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