mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-02 22:59:00 +08:00
552f1ee5f8
* first batch of xwindow PR ports - up to dbus * first batch of xwindow PR ports - up to dbus * format manifest * version stuff * remove if block * version stuff * fix xcb hash * fix xproto dependency on meson blocking cross builds * adjust message * use X11_xcb_LIB * version stuff * put xlib arm64-windows on baseline * fix dbus on osx and linux * version stuff * forget to set the value * fix --export-dynamic on osx * version dbus * ci-retrigger * add license (needs tool update) * version adjustments * version update * remove unnecessary comments * v db * Apply suggestions from code review Co-authored-by: Billy O'Neal <bion@microsoft.com> * nitpicks * rename xau to libxau * use vcpkg_install_copyright and silence usage * xtrans silence usage * format-manifest * v db * make license null for ports without exact match * xdmcp rename to libxdmcp * merge x11 wrapper into xlib rename xlib to libx11 to avoid a metaport * v db * missed dbus depending on x11. * v db * Update scripts/ci.baseline.txt Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Co-authored-by: Alexander Neumann <you@example.com> Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com> Co-authored-by: Billy O'Neal <bion@microsoft.com>
28 lines
999 B
Diff
28 lines
999 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index caef73840..caf7e61bf 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -726,7 +726,7 @@ if(DBUS_ENABLE_PKGCONFIG)
|
|
set(PLATFORM_LIBS pthread ${LIBRT})
|
|
if(PKG_CONFIG_FOUND)
|
|
# convert lists of link libraries into -lstdc++ -lm etc..
|
|
- foreach(LIB ${CMAKE_C_IMPLICIT_LINK_LIBRARIES} ${PLATFORM_LIBS})
|
|
+ foreach(LIB ${PLATFORM_LIBS})
|
|
set(LIBDBUS_LIBS "${LIBDBUS_LIBS} -l${LIB}")
|
|
endforeach()
|
|
set(original_prefix "${CMAKE_INSTALL_PREFIX}")
|
|
diff --git a/dbus/CMakeLists.txt b/dbus/CMakeLists.txt
|
|
index 63070b69b..5752b7492 100644
|
|
--- a/dbus/CMakeLists.txt
|
|
+++ b/dbus/CMakeLists.txt
|
|
@@ -253,6 +253,9 @@ endif()
|
|
|
|
# for clock_getres() on e.g. GNU/Linux (but not Android)
|
|
find_library(LIBRT rt)
|
|
+get_filename_component(LIBRT "${LIBRT}" NAME_WLE)
|
|
+string(REPLACE "lib" "" LIBRT "${LIBRT}")
|
|
+set(LIBRT "${LIBRT}" CACHE STRING "" FORCE)
|
|
|
|
# for socket() on QNX
|
|
find_library(LIBSOCKET socket)
|