Skip to content

Commit

Permalink
cmake: Replace COMPILE_FLAGS with COMPILE_OPTIONS
Browse files Browse the repository at this point in the history
  • Loading branch information
RytoEX committed Feb 10, 2025
1 parent 05c2f56 commit ba9ac1a
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion frontend/cmake/feature-sparkle.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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 "$<LINK_LIBRARY:FRAMEWORK,${SPARKLE}>")

Expand Down
2 changes: 1 addition & 1 deletion frontend/cmake/os-macos.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion libobs/cmake/os-macos.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion plugins/mac-avcapture/legacy/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down

0 comments on commit ba9ac1a

Please sign in to comment.