Sfoglia il codice sorgente

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
Ryan Foster 8 mesi fa
parent
commit
ba9ac1a9a8

+ 1 - 1
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 "$<LINK_LIBRARY:FRAMEWORK,${SPARKLE}>")
 

+ 1 - 1
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)

+ 1 - 1
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)

+ 1 - 1
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(