Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ci/vcpkg/amd64-osx-static-debug.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,7 @@ set(VCPKG_LIBRARY_LINKAGE static)
set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
set(VCPKG_OSX_ARCHITECTURES x86_64)

set(CMAKE_OSX_SYSROOT $ENV{MACOSX_SYSROOT})
set(CMAKE_OSX_DEPLOYMENT_TARGET $ENV{MACOSX_DEPLOYMENT_TARGET})

set(VCPKG_BUILD_TYPE debug)
5 changes: 5 additions & 0 deletions ci/vcpkg/amd64-osx-static-release.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,9 @@ set(VCPKG_LIBRARY_LINKAGE static)
set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
set(VCPKG_OSX_ARCHITECTURES x86_64)

message(STATUS "MACOSX_SYSROOT: $ENV{MACOSX_SYSROOT}")
message(STATUS "MACOSX_DEPLOYMENT_TARGET: $ENV{MACOSX_DEPLOYMENT_TARGET}")
set(CMAKE_OSX_SYSROOT $ENV{MACOSX_SYSROOT})
set(CMAKE_OSX_DEPLOYMENT_TARGET $ENV{MACOSX_DEPLOYMENT_TARGET})

set(VCPKG_BUILD_TYPE release)
3 changes: 3 additions & 0 deletions ci/vcpkg/arm64-osx-static-debug.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,7 @@ set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
set(VCPKG_OSX_ARCHITECTURES arm64)
set(VCPKG_OSX_DEPLOYMENT_TARGET "12.0")

set(CMAKE_OSX_SYSROOT $ENV{MACOSX_SYSROOT})
set(CMAKE_OSX_DEPLOYMENT_TARGET $ENV{MACOSX_DEPLOYMENT_TARGET})

set(VCPKG_BUILD_TYPE debug)
3 changes: 3 additions & 0 deletions ci/vcpkg/arm64-osx-static-release.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,7 @@ set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
set(VCPKG_OSX_ARCHITECTURES arm64)
set(VCPKG_OSX_DEPLOYMENT_TARGET "12.0")

set(CMAKE_OSX_SYSROOT $ENV{MACOSX_SYSROOT})
set(CMAKE_OSX_DEPLOYMENT_TARGET $ENV{MACOSX_DEPLOYMENT_TARGET})

set(VCPKG_BUILD_TYPE release)
44 changes: 44 additions & 0 deletions ci/vcpkg/ports.patch
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
diff --git a/ports/bzip2/CMakeLists.txt b/ports/bzip2/CMakeLists.txt
index d0f200a0a6..129b64db00 100644
--- a/ports/bzip2/CMakeLists.txt
+++ b/ports/bzip2/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)
project(bzip2 C)

if(CMAKE_BUILD_TYPE STREQUAL Debug)
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
index 7cab6f726..697ab1bb4 100644
--- a/ports/curl/portfile.cmake
Expand All @@ -15,6 +25,30 @@ index 7cab6f726..697ab1bb4 100644
)
vcpkg_cmake_install()
vcpkg_copy_pdbs()
diff --git a/ports/gflags/0001-patch-dir.patch b/ports/gflags/0001-patch-dir.patch
index d3aaa00fbe..2a460c64ac 100644
--- a/ports/gflags/0001-patch-dir.patch
+++ b/ports/gflags/0001-patch-dir.patch
@@ -1,8 +1,17 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3709073..8e919cb 100644
+index 657a1f4..842abea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -503,7 +503,7 @@ endif ()
+@@ -70,7 +70,7 @@
+ ## - GFLAGS_INSTALL_SHARED_LIBS
+ ## - GFLAGS_INSTALL_STATIC_LIBS
+
+-cmake_minimum_required (VERSION 3.0.2 FATAL_ERROR)
++cmake_minimum_required (VERSION 3.5 FATAL_ERROR)
+
+ if (POLICY CMP0042)
+ cmake_policy (SET CMP0042 NEW)
+@@ -515,7 +515,7 @@ endif ()
# ----------------------------------------------------------------------------
# installation rules
set (EXPORT_NAME ${PACKAGE_NAME}-targets)
diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake
index a79c72a59..6b7fa6a66 100644
--- a/ports/llvm/portfile.cmake
Expand All @@ -28,6 +62,16 @@ index a79c72a59..6b7fa6a66 100644
)

vcpkg_cmake_install(ADD_BIN_TO_PATH)
diff --git a/ports/lz4/CMakeLists.txt b/ports/lz4/CMakeLists.txt
index a35c8b2d1a..450ac4d127 100644
--- a/ports/lz4/CMakeLists.txt
+++ b/ports/lz4/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)
project(lz4 C)

if(MSVC AND BUILD_SHARED_LIBS)
diff --git a/ports/snappy/portfile.cmake b/ports/snappy/portfile.cmake
index 0312b2ae1..fdb576b5f 100644
--- a/ports/snappy/portfile.cmake
Expand Down
13 changes: 13 additions & 0 deletions dev/tasks/python-wheels/github.osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,22 @@ jobs:
arrow/ci/scripts/install_cmake.sh 3.29.0 ${PWD}/local
echo "${PWD}/local/bin" >> $GITHUB_PATH

- name: Check CMake version
shell: bash
run: |
echo $(cmake --version)
echo $(${PWD}/local/bin/cmake --version)

- name: Retrieve VCPKG version from arrow/.env
run: |
vcpkg_version=$(. "arrow/.env" && echo "${VCPKG}")
echo "VCPKG_VERSION=$vcpkg_version" >> $GITHUB_ENV

- name: Set macOS SDK path
run: |
echo "MACOSX_SYSROOT=$(xcrun --show-sdk-path)" >> $GITHUB_ENV
echo "CMAKE_OSX_SYSROOT=$(xcrun --show-sdk-path)" >> $GITHUB_ENV

- name: Install Vcpkg
env:
GITHUB_TOKEN: {{ '${{ secrets.GITHUB_TOKEN }}' }}
Expand All @@ -81,6 +92,8 @@ jobs:

- name: Install Packages
run: |
echo "${MACOSX_SYSROOT}"
echo "${CMAKE_OSX_SYSROOT}"
vcpkg install \
--clean-after-build \
--x-install-root=${VCPKG_ROOT}/installed \
Expand Down
Loading