diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 3f080f2..a9cefdc 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -88,16 +88,17 @@ jobs: - name: "Set up vcpkg and install dependencies" # TODO use https://github.com/lukka/CppCMakeVcpkgTemplate instead of this + shell: "bash" run: | git clone https://github.com/Microsoft/vcpkg.git - .\vcpkg\bootstrap-vcpkg.bat -disableMetrics + vcpkg/bootstrap-vcpkg -disableMetrics vcpkg install sdl2 - name: "Build" shell: "bash" run: | mkdir build - cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_PREFIX_PATH=vcpkg/installed/x64-windows + cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake cmake --build build dir build/src dir -Path build/conf diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1bbc4a8..39557b7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,5 @@ set(CMAKE_FIND_DEBUG_MODE 1) -find_package(SDL2 REQUIRED) +find_package(SDL2 CONFIG REQUIRED) include_directories(${SDL2_INCLUDE_DIRS}) set(sources