mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-26 06:40:51 +08:00
050e71d01d
* [various ports] remove references to CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS * [alac,benchmark,capnproto] Fix check_linkage call * [fastlz] Fix SHA512 * [coroutine] Fix dynamic build * [folly] Find double-conversion * [gamma] Use vcpkg_from_github * [librsync] Enable static builds * [netcdf-cxx4] Fix SHA512 * [octomap] Fix static build * [tidy-html5] Fix static build * [various ports] remove custom messages for shared/static builds, modernize some scripts in the meantime * [folly] Use ras0219's fix for link paths * [octomap] Fix exported targets * [uvatlas] Set tool download SHA512 * [duktape+python2] fix portfile to call configure with correct python version, manage python2 also outside win32 * [suitesparse] osx fix * [gtkmm] Call vcpkg_check_linkage after including vcpkg functions * [duktape] Resolve conflicts * [duktape] FIxed typo in Python paths * [wangle] Find zlib * [openssl-uwp] Fix SHA512 * [glib] Allow static builds on non-Windows * [suitesparse] Fix build on Windows * [multiple ports] Bump CONTROL version * [multiple ports] Fix description indent * [directxtk] Fix CONTROL file * [bde,duktape,qpid-proton] Build packages with python2 installed * [binn] remove CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS * [gdal,live555,uriparser] Fix regressions * [live555] Update to 2019.04.24
26 lines
1.1 KiB
Diff
26 lines
1.1 KiB
Diff
diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
|
|
index 1522db2..5ed2ea9 100644
|
|
--- a/CMake/folly-deps.cmake
|
|
+++ b/CMake/folly-deps.cmake
|
|
@@ -17,9 +17,17 @@ find_package(Boost 1.51.0 MODULE
|
|
list(APPEND FOLLY_LINK_LIBRARIES ${Boost_LIBRARIES})
|
|
list(APPEND FOLLY_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS})
|
|
|
|
-find_package(DoubleConversion MODULE REQUIRED)
|
|
-list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY})
|
|
-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
|
|
+find_package(double-conversion CONFIG REQUIRED)
|
|
+if (double-conversion_FOUND)
|
|
+ message(STATUS "Found double-conversion from package config")
|
|
+ set(FOLLY_HAVE_DOUBLE_CONVERSION ON)
|
|
+ # How to obtain link libraries from target? double-conversion doesn't set property INTERFACE_LINK_LIBRARIES
|
|
+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
|
|
+else()
|
|
+ find_package(DoubleConversion MODULE)
|
|
+ list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY})
|
|
+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
|
|
+endif()
|
|
|
|
set(FOLLY_HAVE_LIBGFLAGS OFF)
|
|
find_package(gflags CONFIG REQUIRED)
|