fix folly <> glog

add accidentaly removed gtest envvar back in
assignUser · Aug 14, 2024 · 051909d · 051909d
1 parent 94a1654
commit 051909d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
@@ -59,6 +59,7 @@ jobs:
     env:
       CCACHE_DIR: "${{ github.workspace }}/.ccache"
       VELOX_DEPENDENCY_SOURCE: SYSTEM
+      GTest_SOURCE: BUNDLED # remove once images have it #10670
       simdjson_SOURCE: BUNDLED
       xsimd_SOURCE: BUNDLED
       Arrow_SOURCE: AUTO

diff --git a/CMake/resolve_dependency_modules/glog.cmake b/CMake/resolve_dependency_modules/glog.cmake
@@ -41,6 +41,10 @@ unset(BUILD_TESTING)
 unset(BUILD_SHARED_LIBS)
 add_dependencies(glog gflags::gflags)
 
+# Required for folly
+set(glog_INCLUDE_DIR ${glog_BINARY_DIR})
+set(glog_LIBRARY ${glog_BINARY_DIR}/libglog$<$<CONFIG:Debug>:d>.a)
+
 # These headers are missing from the include dir but adding the src dir causes
 # issues with folly so we just copy it to the include dir
 file(COPY ${glog_SOURCE_DIR}/src/glog/platform.h