Actually fix glog vendoring

Author: mszabo-wikia

ci/ubuntu-24.04-noble/debian/control

@@ -34,7 +34,6 @@ Build-Depends:
   libexpat-dev,
   libgd-dev,
   libgmp3-dev,
-  libgoogle-glog-dev,
   libgoogle-perftools-dev,
   libiberty-dev,
   libiconv-hook-dev,

third-party/fizz/CMakeLists.txt

@@ -18,8 +18,6 @@ get_target_property(LIBSODIUM_LIBRARY libsodium INTERFACE_LINK_LIBRARIES)
 get_target_property(ZSTD_INCLUDE_DIR zstd INTERFACE_INCLUDE_DIRECTORIES)
 get_target_property(ZSTD_LIBRARY zstd INTERFACE_LINK_LIBRARIES)
 get_target_property(JEMALLOC_INCLUDE_DIR jemalloc INTERFACE_INCLUDE_DIRECTORIES)
-get_target_property(GLOG_INCLUDE_DIR glog INTERFACE_INCLUDE_DIRECTORIES)
-get_target_property(GLOG_LIBRARY glog INTERFACE_LINK_LIBRARIES)
 
 set(
   FIZZ_DEPS
@@ -32,6 +30,8 @@ set(
 add_library(fizz_deps INTERFACE)
 target_link_libraries(fizz_deps INTERFACE ${FIZZ_DEPS} ${OPENSSL_LIBRARIES})
 
+list(APPEND FIZZ_DEP_PREFIXES "${GLOG_INSTALL_DIR}")
+
 ExternalProject_Add(
   bundled_fizz
   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/
@@ -56,6 +56,8 @@ ExternalProject_Add(
     -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
     -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
 
+    -DCMAKE_PREFIX_PATH=${FIZZ_DEP_PREFIXES}
+
     -DBUILD_TESTS=OFF
     -DBUILD_EXAMPLES=OFF
 
@@ -68,8 +70,6 @@ ExternalProject_Add(
     "-DBOOST_LIBRARYDIR=${BOOST_LIBRARY_DIR}"
     -DDOUBLE_CONVERSION_INCLUDE_DIR=${DOUBLE_CONVERSION_INCLUDE_DIR}
     -DDOUBLE_CONVERSION_LIBRARY=${DOUBLE_CONVERSION_LIBRARY}
-    -DGLOG_INCLUDEDIR=${GLOG_INCLUDE_DIR}
-    -DGLOG_LIBRARYDIR=${GLOG_INSTALL_DIR}/lib
     -DLIBSODIUM_INCLUDEDIR=${LIBSODIUM_INCLUDE_DIR}
     -DLIBSODIUM_LIBRARIES=${LIBSODIUM_LIBRARY}
     -DZSTD_INCLUDE_DIR=${ZSTD_INCLUDE_DIR}

third-party/folly/CMakeLists.txt

@@ -10,10 +10,6 @@ get_target_property(ZSTD_INCLUDE_DIR zstd INTERFACE_INCLUDE_DIRECTORIES)
 get_target_property(ZSTD_LIBRARY zstd INTERFACE_LINK_LIBRARIES)
 get_target_property(JEMALLOC_INCLUDE_DIR jemalloc INTERFACE_INCLUDE_DIRECTORIES)
 get_target_property(FAST_FLOAT_INCLUDE_DIR fast_float INTERFACE_INCLUDE_DIRECTORIES)
-get_target_property(GFLAGS_INCLUDE_DIR gflags INTERFACE_INCLUDE_DIRECTORIES)
-get_target_property(GFLAGS_LIBRARY gflags INTERFACE_LINK_LIBRARIES)
-get_target_property(GLOG_INCLUDE_DIR glog INTERFACE_INCLUDE_DIRECTORIES)
-get_target_property(GLOG_LIBRARY glog INTERFACE_LINK_LIBRARIES)
 
 get_target_property(BOOST_LIBRARIES boost INTERFACE_LINK_LIBRARIES)
 list(GET BOOST_LIBRARIES 0 FIRST_LIB)
@@ -27,6 +23,8 @@ get_filename_component(BOOST_LIBRARY_DIR "${FIRST_LIB}" DIRECTORY)
 set(FOLLY_CXXFLAGS "-I${JEMALLOC_INCLUDE_DIR} -I${CMAKE_CURRENT_LIST_DIR}/include")
 message(STATUS "FOLLY_CXXFLAGS: ${FOLLY_CXXFLAGS}")
 
+list(APPEND FOLLY_DEP_PREFIXES "${GLOG_INSTALL_DIR}")
+
 ExternalProject_add(
   bundled_folly
   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/
@@ -46,18 +44,16 @@ ExternalProject_add(
     -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
     -DCMAKE_INSTALL_INCLUDEDIR=include
     -DCMAKE_INSTALL_LIBDIR=lib
+    -DCMAKE_PREFIX_PATH=${FOLLY_DEP_PREFIXES}
     # Options
     -DWITHOUT_LIBLZMA=ON
     -DWITHOUT_LIBSNAPPY=ON
-    -DWITHOUT_LIBUNWIND=ON
+    -DWITHOUT_LIBUNWIND=Off
     -DFOLLY_USE_SYMBOLIZER=OFF
     # Dependencies
     -DOPENSSL_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR}
     -DOPENSSL_CRYPTO_LIBRARY=${OPENSSL_CRYPTO_LIBRARY}
-    -DGFLAGS_INCLUDE_DIR=${GFLAGS_INCLUDE_DIR}
-    -DGFLAGS_LIBRARY=${GFLAGS_LIBRARY}
-    -DGLOG_INCLUDEDIR=${GLOG_INCLUDE_DIR}
-    -DGLOG_LIBRARYDIR=${GLOG_INSTALL_DIR}/lib
+    -Dgflags_DIR=${gflags_DIR}
     -DBoost_NO_SYSTEM_PATHS=ON
     -DBoost_NO_BOOST_CMAKE=ON
     -DBoost_USE_STATIC_LIBS=${Boost_USE_STATIC_LIBS}

third-party/folly/src/CMake/folly-deps.cmake

@@ -53,6 +53,11 @@ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
 find_package(FastFloat MODULE REQUIRED)
 list(APPEND FOLLY_INCLUDE_DIRECTORIES ${FASTFLOAT_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})
 if(LIBGFLAGS_FOUND)
@@ -62,11 +67,6 @@ if(LIBGFLAGS_FOUND)
   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})

third-party/mcrouter/CMakeLists.txt

@@ -48,7 +48,6 @@ ExternalProject_Add(
 
     "-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}"
     "-DBOOST_INCLUDE_DIR=$<TARGET_PROPERTY:boost,INTERFACE_INCLUDE_DIRECTORIES>"
-    "-DGLOG_INCLUDE_DIR=${GLOG_INCLUDE_DIR}"
     "-DJEMALLOC_INCLUDE_DIR=$<TARGET_PROPERTY:jemalloc,INTERFACE_INCLUDE_DIRECTORIES>"
     "-DOPENSSL_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR}"
 

third-party/mvfst/CMakeLists.txt

@@ -13,13 +13,12 @@ get_filename_component(BOOST_LIBRARY_DIR "${FIRST_LIB}" DIRECTORY)
 
 get_target_property(JEMALLOC_INCLUDE_DIR jemalloc INTERFACE_INCLUDE_DIRECTORIES)
 
-
 ExternalProject_Add(
   bundled_mvfst
   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/
   BUILD_ALWAYS ON
   CMAKE_ARGS
-    "-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}"
+    "-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH};${GLOG_INSTALL_DIR}"
     -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/CMake
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
     -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
@@ -39,8 +38,8 @@ ExternalProject_Add(
     -DBoost_USE_STATIC_LIBS=${Boost_USE_STATIC_LIBS}
     -DBoost_INCLUDE_DIR=${BOOST_INCLUDE_DIR}
     "-DBOOST_LIBRARYDIR=${BOOST_LIBRARY_DIR}"
-    -DLIBGLOG_INCLUDE_DIR=${GLOG_INCLUDE_DIR}
-    -DLIBGLOG_LIBRARY=${GLOG_LIBRARY}
+
+    -Dgflags_DIR=${gflags_DIR}
 
     "-DFizz_DIR=${FIZZ_INSTALL_DIR}/lib/cmake/fizz"
     "-Dfmt_DIR=${fmt_DIR}"

third-party/proxygen/CMakeLists.txt

@@ -15,7 +15,6 @@ get_target_property(ZSTD_INCLUDE_DIR zstd INTERFACE_INCLUDE_DIRECTORIES)
 get_target_property(ZSTD_LIBRARY zstd INTERFACE_LINK_LIBRARIES)
 get_target_property(JEMALLOC_INCLUDE_DIR jemalloc INTERFACE_INCLUDE_DIRECTORIES)
 
-
 ExternalProject_Add(
   bundled_proxygen
   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/
@@ -26,7 +25,7 @@ ExternalProject_Add(
     <SOURCE_DIR>/wangle/cmake/FindBoost.cmake &&
     patch -p1 --force < "${CMAKE_CURRENT_SOURCE_DIR}/patches/mvfst-exception.patch"
   CMAKE_ARGS
-    "-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}"
+    "-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH};${GLOG_INSTALL_DIR}"
     -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/CMake
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
     -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
@@ -48,6 +47,8 @@ ExternalProject_Add(
     -DZSTD_INCLUDE_DIR=${ZSTD_INCLUDE_DIR}
     -DZSTD_LIBRARY_RELEASE=${ZSTD_LIBRARY}
 
+    -Dgflags_DIR=${gflags_DIR}
+
     "-DFizz_DIR=${FIZZ_INSTALL_DIR}/lib/cmake/fizz"
     "-Dfmt_DIR=${fmt_DIR}"
     "-Dfolly_DIR=${FOLLY_INSTALL_DIR}/lib/cmake/folly"

third-party/squangle/CMakeLists.txt

@@ -47,6 +47,8 @@ ExternalProject_Add(
     -DBoost_INCLUDE_DIR=${BOOST_INCLUDE_DIR}
     "-DBOOST_LIBRARYDIR=${BOOST_LIBRARY_DIR}"
 
+    "-DGLOG_INCLUDE_DIR=${GLOG_INSTALL_DIR}/include"
+
     "-Dfmt_DIR=${fmt_DIR}"
     "-Dfolly_DIR=${FOLLY_INSTALL_DIR}/lib/cmake/folly"
 

third-party/squangle/squangle-CMakeLists.txt

@@ -13,7 +13,7 @@ list(REMOVE_ITEM SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/squangle/util/tests/Storag
 add_library(squangle STATIC ${SOURCES})
 target_include_directories(squangle PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
 
-foreach(DEP Boost fbmysqlclient re2)
+foreach(DEP Boost GLOG fbmysqlclient re2)
   set("${DEP}_INCLUDE_DIR" "${DEP}_INCLUDE_DIR-notfound" CACHE PATH "Path to ${DEP}'s includes")
   target_include_directories(squangle PRIVATE "${${DEP}_INCLUDE_DIR}")
 endforeach()

third-party/thrift/CMakeLists.txt

@@ -13,8 +13,6 @@ get_filename_component(BOOST_LIBRARY_DIR "${FIRST_LIB}" DIRECTORY)
 get_target_property(ZSTD_INCLUDE_DIR zstd INTERFACE_INCLUDE_DIRECTORIES)
 get_target_property(ZSTD_LIBRARY zstd INTERFACE_LINK_LIBRARIES)
 get_target_property(JEMALLOC_INCLUDE_DIR jemalloc INTERFACE_INCLUDE_DIRECTORIES)
-get_target_property(GLOG_INCLUDE_DIR glog INTERFACE_INCLUDE_DIRECTORIES)
-get_target_property(GLOG_LIBRARY glog INTERFACE_LINK_LIBRARIES)
 
 get_filename_component(GLOG_LIBRARY_DIR "${GLOG_LIBRARY}" DIRECTORY)
 
@@ -27,7 +25,7 @@ ExternalProject_Add(
   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/
   BUILD_ALWAYS ON
   CMAKE_ARGS
-    "-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}"
+    "-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH};${GLOG_INSTALL_DIR}"
     -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/CMake
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
     -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
@@ -47,10 +45,9 @@ ExternalProject_Add(
     -DBoost_USE_STATIC_LIBS=${Boost_USE_STATIC_LIBS}
     -DBoost_INCLUDE_DIR=${BOOST_INCLUDE_DIR}
     "-DBOOST_LIBRARYDIR=${BOOST_LIBRARY_DIR}"
-    -DGLOG_INCLUDEDIR=${GLOG_INCLUDE_DIR}
-    -DGLOG_LIBRARYDIR=${GLOG_INSTALL_DIR}/lib
     "-DZSTD_INCLUDE_DIRS=${ZSTD_INCLUDE_DIR}"
     "-DZSTD_LIBRARIES=${ZSTD_LIBRARY}"
+    "-Dgflags_DIR=${gflags_DIR}"
 
     "-Dfizz_DIR=${FIZZ_INSTALL_DIR}/lib/cmake/fizz"
     "-DFizz_DIR=${FIZZ_INSTALL_DIR}/lib/cmake/fizz"