From d794906bdc96972f5194f3fb3211cad23942308d Mon Sep 17 00:00:00 2001 From: Roy Shilkrot Date: Sun, 13 Aug 2023 23:53:25 +0300 Subject: [PATCH] whisper universal --- CMakeLists.txt | 4 ++-- cmake/BuildWhispercpp.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b819a6..1a5c8a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,8 +4,8 @@ include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/common/bootstrap.cmake" NO_POLICY_SCO project(${_name} VERSION ${_version}) -option(ENABLE_FRONTEND_API "Use obs-frontend-api for UI functionality" OFF) -option(ENABLE_QT "Use Qt functionality" OFF) +option(ENABLE_FRONTEND_API "Use obs-frontend-api for UI functionality" ON) +option(ENABLE_QT "Use Qt functionality" ON) include(compilerconfig) include(defaults) diff --git a/cmake/BuildWhispercpp.cmake b/cmake/BuildWhispercpp.cmake index aec606e..f559b7f 100644 --- a/cmake/BuildWhispercpp.cmake +++ b/cmake/BuildWhispercpp.cmake @@ -1,6 +1,6 @@ include(ExternalProject) -string(REPLACE ";" "$" CMAKE_OSX_ARCHITECTURES_ "${CMAKE_OSX_ARCHITECTURES}") +set(CMAKE_OSX_ARCHITECTURES_ "arm64$x86_64") if(${CMAKE_BUILD_TYPE} STREQUAL Release OR ${CMAKE_BUILD_TYPE} STREQUAL RelWithDebInfo) set(Whispercpp_BUILD_TYPE Release) @@ -26,7 +26,7 @@ ExternalProject_Add( -DCMAKE_BUILD_TYPE=${Whispercpp_BUILD_TYPE} -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM} -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 - # -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES_} + -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES_} -DCMAKE_CXX_FLAGS=${WHISPER_EXTRA_CXX_FLAGS} -DCMAKE_C_FLAGS=${WHISPER_EXTRA_CXX_FLAGS} -DBUILD_SHARED_LIBS=OFF