reorder.patch 1.0 KB

123456789101112131415161718192021222324252627
  1. diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
  2. --- a/CMake/folly-deps.cmake
  3. +++ b/CMake/folly-deps.cmake
  4. @@ -52,6 +52,11 @@ find_package(DoubleConversion MODULE REQUIRED)
  5. list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY})
  6. list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
  7. +find_package(Glog CONFIG REQUIRED)
  8. +set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND})
  9. +list(APPEND FOLLY_LINK_LIBRARIES glog::glog)
  10. +list(APPEND FOLLY_INCLUDE_DIRECTORIES ${GLOG_INCLUDE_DIR})
  11. +
  12. find_package(Gflags MODULE)
  13. set(FOLLY_HAVE_LIBGFLAGS ${LIBGFLAGS_FOUND})
  14. if(LIBGFLAGS_FOUND)
  15. @@ -61,11 +66,6 @@
  16. set(FOLLY_LIBGFLAGS_INCLUDE ${LIBGFLAGS_INCLUDE_DIR})
  17. endif()
  18. -find_package(Glog MODULE)
  19. -set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND})
  20. -list(APPEND FOLLY_LINK_LIBRARIES ${GLOG_LIBRARY})
  21. -list(APPEND FOLLY_INCLUDE_DIRECTORIES ${GLOG_INCLUDE_DIR})
  22. -
  23. find_package(LibEvent MODULE REQUIRED)
  24. list(APPEND FOLLY_LINK_LIBRARIES ${LIBEVENT_LIB})
  25. list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR})