Skip to content
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
build-windows:
uses: ./.github/workflows/windows.yml
with:
cmake-version: '3.31.0'
cmake-version: '4.2.7'
platforms: "['x64', 'Win32', 'ARM64']"
configurations: "['RelWithDebInfo', 'Debug']"
# MacOS
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ on:
jobs:
build:
runs-on: windows-latest
env:
# CMake 4.x removed compatibility with cmake_minimum_required(VERSION < 3.5).
# The vendored RapidJSON source (downloaded at configure time) still declares an
# older minimum, so clamp the policy version for its nested/child configures.
CMAKE_POLICY_VERSION_MINIMUM: "3.5"
strategy:
matrix:
platform: ${{ fromJson(inputs.platforms) }}
Expand All @@ -26,11 +31,11 @@ jobs:
with:
submodules: 'true'
- name: Setup CMake
uses: jwlawson/actions-setup-cmake@v2.0.2
uses: jwlawson/actions-setup-cmake@v2.2.0
with:
cmake-version: ${{ inputs.cmake-version }}
- name: CMake Configure
run: cmake -G "Visual Studio 17 2022" -A ${{ matrix.platform }} -B ./Built/Int/cmake_${{ matrix.platform }} .
run: cmake -G "Visual Studio 18 2026" -A ${{ matrix.platform }} -B ./Built/Int/cmake_${{ matrix.platform }} .
- name: CMake Build
run: cmake --build . --target install --config ${{ matrix.config }}
working-directory: ./Built/Int/cmake_${{ matrix.platform }}
Expand Down
2 changes: 1 addition & 1 deletion External/RapidJSON/CMakeRapidJSONDownload.txt.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.2)
cmake_minimum_required(VERSION 3.5)

project(RapidJSON-download NONE)

Expand Down
7 changes: 7 additions & 0 deletions GLTFSDK.Samples/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
cmake_minimum_required(VERSION 3.5)

# Visual Studio 2026 (MSVC 14.5x) removed the <experimental/filesystem> header that
# these samples fall back to under C++14. Build the samples as C++17 so they use the
# standard <filesystem> header instead (see each sample's Source/main.cpp). The GLTFSDK
# library itself continues to target C++14.
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

add_subdirectory(Deserialize)
add_subdirectory(Serialize)
Loading