4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cmake: Replace COMPILE_FLAGS with COMPILE_OPTIONS

Browse source 
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
This commit is contained in:
Ryan Foster 2025-02-07 15:57:56 -05:00
commit ba9ac1a9a8
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
frontend/cmake/feature-sparkle.cmake
View file

@ -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}>")

2
frontend/cmake/os-macos.cmake
View file

@ -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)

2
libobs/cmake/os-macos.cmake
View file

@ -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
plugins/mac-avcapture/legacy/CMakeLists.txt
View file

@ -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(