fix

apache · Nov 9, 2023 · 2f71a09 · 2f71a09
1 parent 2bb522f
commit 2f71a09
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 34 deletions.
diff --git a/cpp/CMake/BuildGTest.cmake b/cpp/CMake/BuildGTest.cmake
@@ -8,9 +8,7 @@ set(GLUTEN_GTEST_SOURCE_URL
     "https://github.com/google/googletest/archive/refs/tags/v${GLUTEN_GTEST_VERSION}.tar.gz"
     )
 
-if(DEFINED ENV{GLUTEN_GTEST_SOURCE_URL})
-  set(GLUTEN_GTEST_SOURCE_URL "$ENV{GLUTEN_GTEST_SOURCE_URL}")
-endif()
+resolve_dependency_url(GTEST)
 
 message(STATUS "Building gtest from source")
 FetchContent_Declare(

diff --git a/cpp/CMake/BuildGflags.cmake b/cpp/CMake/BuildGflags.cmake
@@ -22,6 +22,8 @@ string(CONCAT GLUTEN_GFLAGS_SOURCE_URL
   "https://github.com/gflags/gflags/archive/refs/tags/"
   "v${GLUTEN_GFLAGS_VERSION}.tar.gz")
 
+resolve_dependency_url(GFLAGS)
+
 message(STATUS "Building gflags from source")
 FetchContent_Declare(
   gflags

diff --git a/cpp/CMake/BuildGlog.cmake b/cpp/CMake/BuildGlog.cmake
@@ -19,6 +19,8 @@ set(GLUTEN_GLOG_SOURCE_URL
   "https://github.com/google/glog/archive/refs/tags/v${GLUTEN_GLOG_VERSION}.tar.gz"
   )
 
+resolve_dependency_url(GLOG)
+
 message(STATUS "Building glog from source")
 FetchContent_Declare(
   glog

diff --git a/cpp/CMake/BuildGoogleBenchmark.cmake b/cpp/CMake/BuildGoogleBenchmark.cmake
@@ -24,17 +24,15 @@ set(GLUTEN_GBENCHMARK_SOURCE_URL
     "https://github.com/ursa-labs/thirdparty/releases/download/latest/gbenchmark-${GLUTEN_GBENCHMARK_BUILD_VERSION}.tar.gz")
 set(GLUTEN_GBENCHMARK_BUILD_SHA256_CHECKSUM "1f71c72ce08d2c1310011ea6436b31e39ccab8c2db94186d26657d41747c85d6")
 
-if(DEFINED ENV{GLUTEN_GBENCHMARK_SOURCE_URL})
-  set(GLUTEN_GBENCHMARK_SOURCE_URL "$ENV{GLUTEN_GBENCHMARK_SOURCE_URL}")
-endif()
+resolve_dependency_url(GBENCHMARK)
 
 set(GBENCHMARK_CMAKE_ARGS "-fPIC -w")
 
 message(STATUS "Building google benchmark from source")
 FetchContent_Declare(
     gbenchmark
     URL ${GLUTEN_GBENCHMARK_SOURCE_URL}
-    URL_HASH "SHA256=${GLUTEN_GBENCHMARK_BUILD_SHA256_CHECKSUM}"
+    URL_HASH "${GLUTEN_GBENCHMARK_BUILD_SHA256_CHECKSUM}"
 )
 
 if (NOT gbenchmark_POPULATED)

diff --git a/cpp/CMake/ResolveDependency.cmake b/cpp/CMake/ResolveDependency.cmake
@@ -0,0 +1,44 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+function(set_with_default var_name envvar_name default)
+  if(DEFINED ENV{${envvar_name}})
+    set(${var_name}
+        $ENV{${envvar_name}}
+        PARENT_SCOPE)
+  else()
+    set(${var_name}
+        ${default}
+        PARENT_SCOPE)
+  endif()
+endfunction()
+
+macro(resolve_dependency_url dependency_name)
+  # Prepend prefix for default checksum.
+  string(PREPEND GLUTEN_${dependency_name}_BUILD_SHA256_CHECKSUM "SHA256=")
+
+  set_with_default(
+    GLUTEN_${dependency_name}_SOURCE_URL GLUTEN_${dependency_name}_URL
+    ${GLUTEN_${dependency_name}_SOURCE_URL})
+  if(DEFINED ENV{GLUTEN_${dependency_name}_URL})
+    set_with_default(GLUTEN_${dependency_name}_BUILD_SHA256_CHECKSUM
+                     GLUTEN_${dependency_name}_SHA256 "")
+    if(DEFINED ENV{GLUTEN_${dependency_name}_SHA256})
+      string(PREPEND GLUTEN_${dependency_name}_BUILD_SHA256_CHECKSUM "SHA256=")
+    endif()
+  endif()
+endmacro()
diff --git a/cpp/CMake/Simdjson.cmake b/cpp/CMake/Simdjson.cmake
@@ -17,33 +17,6 @@
 
 include_guard(GLOBAL)
 include(FetchContent)
-function(set_with_default var_name envvar_name default)
-  if(DEFINED ENV{${envvar_name}})
-    set(${var_name}
-        $ENV{${envvar_name}}
-        PARENT_SCOPE)
-  else()
-    set(${var_name}
-        ${default}
-        PARENT_SCOPE)
-  endif()
-endfunction()
-
-macro(resolve_dependency_url dependency_name)
-  # Prepend prefix for default checksum.
-  string(PREPEND GLUTEN_${dependency_name}_BUILD_SHA256_CHECKSUM "SHA256=")
-
-  set_with_default(
-    GLUTEN_${dependency_name}_SOURCE_URL GLUTEN_${dependency_name}_URL
-    ${GLUTEN_${dependency_name}_SOURCE_URL})
-  if(DEFINED ENV{GLUTEN_${dependency_name}_URL})
-    set_with_default(GLUTEN_${dependency_name}_BUILD_SHA256_CHECKSUM
-                     GLUTEN_${dependency_name}_SHA256 "")
-    if(DEFINED ENV{GLUTEN_${dependency_name}_SHA256})
-      string(PREPEND GLUTEN_${dependency_name}_BUILD_SHA256_CHECKSUM "SHA256=")
-    endif()
-  endif()
-endmacro()
 
 set(GLUTEN_SIMDJSON_VERSION 3.1.5)
 set(GLUTEN_SIMDJSON_BUILD_SHA256_CHECKSUM

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -66,6 +66,8 @@ else()
   set(ARROW_HOME ${VELOX_HOME}/_build/release/third_party/arrow_ep)
 endif()
 
+include(ResolveDependency)
+
 #
 # Compiler flags
 #
-Original file line number
+Diff line change
@@ Expand Up / @@ -66,6 +66,8 @@ else() @@
       set(ARROW_HOME ${VELOX_HOME}/_build/release/third_party/arrow_ep)
     endif()
+    include(ResolveDependency)
     #
     # Compiler flags
     #
@@ Expand Down @@