From ba9ac1a9a83c644ffccc53c306958e43ef07ee33 Mon Sep 17 00:00:00 2001 From: Ryan Foster Date: Fri, 7 Feb 2025 15:57:56 -0500 Subject: [PATCH] cmake: Replace COMPILE_FLAGS with COMPILE_OPTIONS COMPILE_OPTIONS was added and superseded COMPILE_FLAGS in CMake 3.11. https://cmake.org/cmake/help/v3.30/prop_sf/COMPILE_FLAGS.html https://cmake.org/cmake/help/v3.30/prop_sf/COMPILE_OPTIONS.html --- frontend/cmake/feature-sparkle.cmake | 2 +- frontend/cmake/os-macos.cmake | 2 +- libobs/cmake/os-macos.cmake | 2 +- plugins/mac-avcapture/legacy/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/cmake/feature-sparkle.cmake b/frontend/cmake/feature-sparkle.cmake index 3c99357025273a..a3c70464b8896b 100644 --- a/frontend/cmake/feature-sparkle.cmake +++ b/frontend/cmake/feature-sparkle.cmake @@ -11,7 +11,7 @@ if(SPARKLE_APPCAST_URL AND SPARKLE_PUBLIC_KEY) utility/OBSUpdateDelegate.h utility/OBSUpdateDelegate.mm ) - set_source_files_properties(utility/OBSSparkle.mm PROPERTIES COMPILE_FLAGS -fobjc-arc) + set_source_files_properties(utility/OBSSparkle.mm PROPERTIES COMPILE_OPTIONS -fobjc-arc) target_link_libraries(obs-studio PRIVATE "$") diff --git a/frontend/cmake/os-macos.cmake b/frontend/cmake/os-macos.cmake index 0bd51c923f4ff4..e4e14b6c0d7017 100644 --- a/frontend/cmake/os-macos.cmake +++ b/frontend/cmake/os-macos.cmake @@ -11,7 +11,7 @@ target_sources( ) target_compile_options(obs-studio PRIVATE -Wno-quoted-include-in-framework-header -Wno-comma) -set_source_files_properties(platform-osx.mm PROPERTIES COMPILE_FLAGS -fobjc-arc) +set_source_files_properties(platform-osx.mm PROPERTIES COMPILE_OPTIONS -fobjc-arc) if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 14.0.3) target_compile_options(obs-studio PRIVATE -Wno-error=unqualified-std-cast-call) diff --git a/libobs/cmake/os-macos.cmake b/libobs/cmake/os-macos.cmake index 4d63b5fa035178..2d2ec8268fb20d 100644 --- a/libobs/cmake/os-macos.cmake +++ b/libobs/cmake/os-macos.cmake @@ -28,5 +28,5 @@ target_sources( target_compile_options(libobs PUBLIC -Wno-strict-prototypes -Wno-shorten-64-to-32) -set_property(SOURCE obs-cocoa.m util/platform-cocoa.m PROPERTY COMPILE_FLAGS -fobjc-arc) +set_property(SOURCE obs-cocoa.m util/platform-cocoa.m PROPERTY COMPILE_OPTIONS -fobjc-arc) set_property(TARGET libobs PROPERTY FRAMEWORK TRUE) diff --git a/plugins/mac-avcapture/legacy/CMakeLists.txt b/plugins/mac-avcapture/legacy/CMakeLists.txt index 81c8373175b794..58bd62bd0109e0 100644 --- a/plugins/mac-avcapture/legacy/CMakeLists.txt +++ b/plugins/mac-avcapture/legacy/CMakeLists.txt @@ -6,7 +6,7 @@ add_library(OBS::avcapture ALIAS mac-avcapture) target_sources(mac-avcapture PRIVATE av-capture.mm left-right.hpp scope-guard.hpp) if(NOT XCODE) - set_source_files_properties(av-capture.mm PROPERTIES COMPILE_FLAGS -fobjc-arc) + set_source_files_properties(av-capture.mm PROPERTIES COMPILE_OPTIONS -fobjc-arc) endif() target_link_libraries(