Skip to content

Commit 0fc48c9

Browse files
committed
Github action for mac intel
1 parent 7cf2f31 commit 0fc48c9

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

.github/workflows/vcpkg-build.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ jobs:
1111
matrix:
1212
cfg:
1313
- { os: ubuntu-latest, triplet: x64-linux }
14-
- { os: windows-2022, triplet: x64-windows-static-vs2022 }
15-
- { os: macos-13, triplet: x64-osx }
14+
- { os: windows-latest, triplet: x64-windows-static-vs2022 }
15+
- { os: macos-latest, triplet: arm64-osx }
16+
- { os: macos-latest-large, triplet: x64-osx }
1617

1718
steps:
1819
- name: install python

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ if(INFRA_IS_TOPLEVEL)
5757
message(STATUS "Toplevel infra build C++${CMAKE_CXX_STANDARD}")
5858
set(CMAKE_REQUIRED_FLAGS ${CMAKE_CXX17_STANDARD_COMPILE_OPTION})
5959

60-
# set(CMAKE_REQUIRED_FLAGS ${CMAKE_CXX17_STANDARD_COMPILE_OPTION})
6160
if(MSVC OR(WIN32 AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "IntelLLVM"))
6261
# avoid windows specific warnings
6362
add_definitions(

deps/vcpkg

Submodule vcpkg updated 296 files

vcpkg.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@
7373
{
7474
"name": "gdal",
7575
"features": [
76-
"geos"
76+
"geos",
77+
"netcdf"
7778
]
7879
}
7980
]

0 commit comments

Comments
 (0)