mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-23 06:30:25 +08:00
9d473a6954
* [boost] Update to 1.70.0 * [boost-build] Update to 1.70.0 * [folly][freeopcua][libtorrent][websocketpp] Upgrades/patches to handle boost 1.70 * [boost-variant] Revert to 1.69 due to regression [fizz][folly] Update and fix for boost 1.70 [libsodium] Use CMake buildsystem replacement to enable non-Windows * [wangle] Update. [folly] Avoid linking debug libs in release. * [pcl] Fix compatibility with boost 1.70 * [fizz] Handle merge regression * [arrow] Modernize and fix cmake targets * [boost-type-traits] Update patches for arm64-windows * [boost-locale] Add boost-system and boost-thread as arm64 dependencies * [ompl] Add missing boost-timer dependency
29 lines
1.2 KiB
Diff
29 lines
1.2 KiB
Diff
diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
|
|
index e0bbcbb..fb45331 100644
|
|
--- a/CMake/folly-deps.cmake
|
|
+++ b/CMake/folly-deps.cmake
|
|
@@ -24,6 +24,11 @@ find_package(DoubleConversion MODULE REQUIRED)
|
|
list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY})
|
|
list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
|
|
|
|
+find_package(Glog MODULE)
|
|
+set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND})
|
|
+list(APPEND FOLLY_LINK_LIBRARIES ${GLOG_LIBRARY})
|
|
+list(APPEND FOLLY_INCLUDE_DIRECTORIES ${GLOG_INCLUDE_DIR})
|
|
+
|
|
find_package(Gflags MODULE)
|
|
set(FOLLY_HAVE_LIBGFLAGS ${LIBGFLAGS_FOUND})
|
|
list(APPEND FOLLY_LINK_LIBRARIES ${LIBGFLAGS_LIBRARY})
|
|
@@ -31,11 +36,6 @@ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBGFLAGS_INCLUDE_DIR})
|
|
list(APPEND CMAKE_REQUIRED_LIBRARIES ${LIBGFLAGS_LIBRARY})
|
|
list(APPEND CMAKE_REQUIRED_INCLUDES ${LIBGFLAGS_INCLUDE_DIR})
|
|
|
|
-find_package(Glog MODULE)
|
|
-set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND})
|
|
-list(APPEND FOLLY_LINK_LIBRARIES ${GLOG_LIBRARY})
|
|
-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${GLOG_INCLUDE_DIR})
|
|
-
|
|
find_package(LibEvent MODULE REQUIRED)
|
|
list(APPEND FOLLY_LINK_LIBRARIES ${LIBEVENT_LIB})
|
|
list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR})
|