build attempt

hafenkran · Jul 4, 2024 · 83c6afc · 83c6afc
1 parent 9ab2827
commit 83c6afc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/_extension_distribution.yml b/.github/workflows/_extension_distribution.yml
@@ -213,8 +213,9 @@ jobs:
                   CC: ${{ matrix.duckdb_arch == 'linux_arm64' && 'aarch64-linux-gnu-gcc' || '' }}
                   CXX: ${{ matrix.duckdb_arch == 'linux_arm64' && 'aarch64-linux-gnu-g++' || '' }}
                   DUCKDB_PLATFORM: ${{ matrix.duckdb_arch }}
+                  VCPKG_BUILD: 0
               run: |
-                  make release
+                  make release VCPKG_DEFAULT_TRIPLET=arm64-linux
 
             # - name: Test extension
             #   if: ${{ matrix.duckdb_arch != 'linux_arm64'}}

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,6 +19,7 @@ execute_process(
         -DCMAKE_OSX_ARCHITECTURES=${DCMAKE_OSX_ARCHITECTURES}
         -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
         -DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}
+        -DVCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}
         -S ${CMAKE_CURRENT_SOURCE_DIR}/external -B ${CMAKE_BINARY_DIR}/external
     RESULT_VARIABLE DEPENDENCIES_GENERATE_RESULT)
 

diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -11,8 +11,6 @@ if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.24.0")
     cmake_policy(SET CMP0135 NEW)
 endif()
 
-find_package(GTest REQUIRED)
-
 ExternalProject_Add(
     google_cloud_cpp_bigquery_rest
     URL ${CMAKE_CURRENT_SOURCE_DIR}/vendor/google-cloud-cpp-2.22.0-fixed.zip