From 17460be026aa26439118ebabaa1c2e4db5b39c82 Mon Sep 17 00:00:00 2001 From: Stepanov Igor Date: Wed, 25 Dec 2024 03:07:14 +0300 Subject: [PATCH] Fix builds --- .github/workflows/windows-clang.yml | 2 -- src/CMakeLists.txt | 7 ++++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows-clang.yml b/.github/workflows/windows-clang.yml index 4308b0fe..fc184151 100644 --- a/.github/workflows/windows-clang.yml +++ b/.github/workflows/windows-clang.yml @@ -30,8 +30,6 @@ jobs: run: | git clone https://github.com/microsoft/vcpkg.git ${{ github.workspace }}/vcpkg/bootstrap-vcpkg.bat - ${{ github.workspace }}/vcpkg integrate install - - name: Configure and build project with CMake and vcpkg env: VCPKG_ROOT: ${{ github.workspace }}/vcpkg diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e6274289..ce50116c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -10,7 +10,12 @@ add_library(${PROJECT_NAME} STATIC ${SOURCES} ${HEADERS}) find_package(OpenGL REQUIRED) find_package(GLEW REQUIRED) -find_package(OpenAL CONFIG REQUIRED) +if (CMAKE_SYSTEM_NAME STREQUAL "Windows") + # specific for vcpkg + find_package(OpenAL CONFIG REQUIRED) +else() + find_package(OpenAL REQUIRED) +endif() find_package(ZLIB REQUIRED) find_package(PNG REQUIRED) find_package(CURL REQUIRED)