Skip to content

Commit

Permalink
Merge pull request #21 from aeris170/cmake-vcpkg-action
Browse files Browse the repository at this point in the history
Cmake vcpkg action
  • Loading branch information
aeris170 committed Aug 30, 2024
2 parents 7f185c3 + 1b38633 commit 5a7ee12
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cmake-multi-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- os: ubuntu-24.04
c_compiler: clang
cpp_compiler: clang++
cmake_cxx_flags: "-std=c++23 -stdlib=libc++"
cmake_cxx_flags: "-stdlib=libc++"
exclude:
- os: windows-latest
c_compiler: clang
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
cmake -B ${{ steps.strings.outputs.build-output-dir }}
-DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
-DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
-DCMAKE_CXX_FLAGS="${{ matrix.cmake_cxx_flags }}"
-DCMAKE_CXX_FLAGS=${{ matrix.cmake_cxx_flags }}
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
-S ${{ github.workspace }}
Expand Down
2 changes: 1 addition & 1 deletion Engine/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.26.4)

project(Engine LANGUAGES CXX)
set(CMAKE_CXX_STANDARD 23)
set(CMAKE_CXX_STANDARD_REQUIRED True)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

add_library(Engine STATIC)
target_include_directories(Engine PUBLIC ..)
Expand Down

0 comments on commit 5a7ee12

Please sign in to comment.