diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake --- a/CMake/folly-deps.cmake +++ b/CMake/folly-deps.cmake @@ -52,6 +52,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 CONFIG REQUIRED) +set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND}) +list(APPEND FOLLY_LINK_LIBRARIES glog::glog) +list(APPEND FOLLY_INCLUDE_DIRECTORIES ${GLOG_INCLUDE_DIR}) + find_package(Gflags MODULE) set(FOLLY_HAVE_LIBGFLAGS ${LIBGFLAGS_FOUND}) if(LIBGFLAGS_FOUND) @@ -61,11 +66,6 @@ set(FOLLY_LIBGFLAGS_INCLUDE ${LIBGFLAGS_INCLUDE_DIR}) endif() -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})