diff --git a/ports/steam-audio/portfile.cmake b/ports/steam-audio/portfile.cmake index b123f07d56e6a1..7c2a3d6c487c42 100644 --- a/ports/steam-audio/portfile.cmake +++ b/ports/steam-audio/portfile.cmake @@ -28,9 +28,13 @@ if(VCPKG_TARGET_IS_UWP) set(WINDOWS_STATIC_RUNTIME "-DSTEAMAUDIO_STATIC_RUNTIME=OFF") endif() +# We need to find flatc for steam-audio +find_program(FlatBuffers_EXECUTABLE NAMES flatc PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools/flatbuffers" "bin" NO_DEFAULT_PATHS) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/core" OPTIONS + -DFlatBuffers_EXECUTABLE=${FlatBuffers_EXECUTABLE} -DSTEAMAUDIO_BUILD_TESTS=OFF -DSTEAMAUDIO_BUILD_ITESTS=OFF -DSTEAMAUDIO_BUILD_SAMPLES=OFF diff --git a/ports/steam-audio/use-vcpkg-deps.patch b/ports/steam-audio/use-vcpkg-deps.patch index cbec3290e02a44..348ae1a3afaeb4 100644 --- a/ports/steam-audio/use-vcpkg-deps.patch +++ b/ports/steam-audio/use-vcpkg-deps.patch @@ -35,17 +35,6 @@ diff --git a/core/src/core/CMakeLists.txt b/core/src/core/CMakeLists.txt index 7c9226f..56c4c44 100644 --- a/core/src/core/CMakeLists.txt +++ b/core/src/core/CMakeLists.txt -@@ -26,6 +26,10 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/phonon.rc.in ${CMAKE_CURRENT_BINARY_D - # FLATBUFFERS - # - -+find_program(FlatBuffers_EXECUTABLE flatc -+ PATHS ${_VCPKG_ROOT_DIR}/packages/flatbuffers_${VCPKG_HOST_TRIPLET}/tools/flatbuffers -+ REQUIRED) -+ - function (compile_fbs FBS_SOURCE) - set(FBS_OUTPUT ${FBS_SOURCE}.h) - @@ -176,7 +180,8 @@ endif() #