Browse Source

cmake: Fix order of frontend targets

Updates targets to be consistent in their order putting uppercase before lowercase
Warchamp7 2 weeks ago
parent
commit
bd2024eb81

+ 1 - 1
frontend/cmake/feature-idian-playground.cmake

@@ -3,7 +3,7 @@ option(ENABLE_IDIAN_PLAYGROUND "Enable building custom idian widget demo window"
 if(ENABLE_IDIAN_PLAYGROUND)
   target_sources(
     obs-studio
-    PRIVATE forms/OBSIdianPlayground.ui dialogs/OBSIdianPlayground.hpp dialogs/OBSIdianPlayground.cpp
+    PRIVATE dialogs/OBSIdianPlayground.hpp dialogs/OBSIdianPlayground.cpp forms/OBSIdianPlayground.ui
   )
   target_enable_feature(obs-studio "Idian Playground" ENABLE_IDIAN_PLAYGROUND)
 else()

+ 4 - 4
frontend/cmake/feature-macos-update.cmake

@@ -9,16 +9,16 @@ endif()
 target_sources(
   obs-studio
   PRIVATE
+    utility/WhatsNewBrowserInitThread.cpp
+    utility/WhatsNewBrowserInitThread.hpp
+    utility/WhatsNewInfoThread.cpp
+    utility/WhatsNewInfoThread.hpp
     utility/crypto-helpers-mac.mm
     utility/crypto-helpers.hpp
     utility/models/branches.hpp
     utility/models/whatsnew.hpp
     utility/update-helpers.cpp
     utility/update-helpers.hpp
-    utility/WhatsNewBrowserInitThread.cpp
-    utility/WhatsNewBrowserInitThread.hpp
-    utility/WhatsNewInfoThread.cpp
-    utility/WhatsNewInfoThread.hpp
 )
 
 target_link_libraries(

+ 4 - 4
frontend/cmake/feature-whatsnew.cmake

@@ -20,15 +20,15 @@ if(ENABLE_WHATSNEW AND TARGET OBS::browser-panels)
     target_sources(
       obs-studio
       PRIVATE
+        utility/WhatsNewBrowserInitThread.cpp
+        utility/WhatsNewBrowserInitThread.hpp
+        utility/WhatsNewInfoThread.cpp
+        utility/WhatsNewInfoThread.hpp
         utility/crypto-helpers-mbedtls.cpp
         utility/crypto-helpers.hpp
         utility/models/whatsnew.hpp
         utility/update-helpers.cpp
         utility/update-helpers.hpp
-        utility/WhatsNewBrowserInitThread.cpp
-        utility/WhatsNewBrowserInitThread.hpp
-        utility/WhatsNewInfoThread.cpp
-        utility/WhatsNewInfoThread.hpp
     )
   endif()
 

+ 1 - 1
frontend/cmake/os-freebsd.cmake

@@ -1,10 +1,10 @@
 target_sources(
   obs-studio
   PRIVATE
+    utility/CrashHandler_FreeBSD.cpp
     utility/NativeEventFilter.cpp
     utility/platform-x11.cpp
     utility/system-info-posix.cpp
-    utility/CrashHandler_FreeBSD.cpp
 )
 target_compile_definitions(obs-studio PRIVATE OBS_INSTALL_PREFIX="${OBS_INSTALL_PREFIX}")
 target_link_libraries(obs-studio PRIVATE Qt::GuiPrivate Qt::DBus procstat)

+ 1 - 1
frontend/cmake/os-linux.cmake

@@ -1,10 +1,10 @@
 target_sources(
   obs-studio
   PRIVATE
+    utility/CrashHandler_Linux.cpp
     utility/NativeEventFilter.cpp
     utility/platform-x11.cpp
     utility/system-info-posix.cpp
-    utility/CrashHandler_Linux.cpp
 )
 target_compile_definitions(
   obs-studio

+ 5 - 5
frontend/cmake/os-windows.cmake

@@ -25,19 +25,19 @@ target_sources(
     utility/AutoUpdateThread.cpp
     utility/AutoUpdateThread.hpp
     utility/CrashHandler_Windows.cpp
+    utility/NativeEventFilter_Windows.cpp
+    utility/WhatsNewBrowserInitThread.cpp
+    utility/WhatsNewBrowserInitThread.hpp
+    utility/WhatsNewInfoThread.cpp
+    utility/WhatsNewInfoThread.hpp
     utility/crypto-helpers-mbedtls.cpp
     utility/crypto-helpers.hpp
     utility/models/branches.hpp
     utility/models/whatsnew.hpp
-    utility/NativeEventFilter_Windows.cpp
     utility/platform-windows.cpp
     utility/system-info-windows.cpp
     utility/update-helpers.cpp
     utility/update-helpers.hpp
-    utility/WhatsNewBrowserInitThread.cpp
-    utility/WhatsNewBrowserInitThread.hpp
-    utility/WhatsNewInfoThread.cpp
-    utility/WhatsNewInfoThread.hpp
     utility/win-dll-blocklist.c
 )
 

+ 1 - 1
frontend/cmake/ui-models.cmake

@@ -1 +1 @@
-target_sources(obs-studio PRIVATE models/SceneCollection.cpp models/SceneCollection.hpp models/Rect.cpp models/Rect.hpp)
+target_sources(obs-studio PRIVATE models/Rect.cpp models/Rect.hpp models/SceneCollection.cpp models/SceneCollection.hpp)

+ 1 - 1
frontend/cmake/ui-qt.cmake

@@ -46,8 +46,8 @@ target_sources(
     forms/OBSMissingFiles.ui
     forms/OBSRemux.ui
     forms/StatusBarWidget.ui
-    forms/obs.qrc
     forms/PluginManagerWindow.ui
+    forms/obs.qrc
     forms/source-toolbar/browser-source-toolbar.ui
     forms/source-toolbar/color-source-toolbar.ui
     forms/source-toolbar/device-select-toolbar.ui

+ 12 - 12
frontend/cmake/ui-utility.cmake

@@ -3,14 +3,11 @@ target_sources(
   PRIVATE
     utility/AdvancedOutput.cpp
     utility/AdvancedOutput.hpp
-    utility/audio-encoders.cpp
-    utility/audio-encoders.hpp
     utility/BaseLexer.hpp
     utility/BasicOutputHandler.cpp
     utility/BasicOutputHandler.hpp
     utility/CrashHandler.cpp
     utility/CrashHandler.hpp
-    utility/display-helpers.hpp
     utility/FFmpegCodec.cpp
     utility/FFmpegCodec.hpp
     utility/FFmpegFormat.cpp
@@ -22,20 +19,15 @@ target_sources(
     utility/GoLiveAPI_Network.hpp
     utility/GoLiveAPI_PostData.cpp
     utility/GoLiveAPI_PostData.hpp
-    utility/item-widget-helpers.cpp
-    utility/item-widget-helpers.hpp
     utility/MissingFilesModel.cpp
     utility/MissingFilesModel.hpp
     utility/MissingFilesPathItemDelegate.cpp
     utility/MissingFilesPathItemDelegate.hpp
-    utility/models/multitrack-video.hpp
     utility/MultitrackVideoError.cpp
     utility/MultitrackVideoError.hpp
     utility/MultitrackVideoOutput.cpp
     utility/MultitrackVideoOutput.hpp
     utility/NativeEventFilter.hpp
-    utility/obf.c
-    utility/obf.h
     utility/OBSCanvas.cpp
     utility/OBSCanvas.hpp
     utility/OBSEventFilter.hpp
@@ -45,7 +37,6 @@ target_sources(
     utility/OBSThemeVariable.hpp
     utility/OBSTranslator.cpp
     utility/OBSTranslator.hpp
-    utility/platform.hpp
     utility/QuickTransition.cpp
     utility/QuickTransition.hpp
     utility/RemoteTextThread.cpp
@@ -65,10 +56,19 @@ target_sources(
     utility/SimpleOutput.hpp
     utility/StartMultiTrackVideoStreamingGuard.hpp
     utility/SurfaceEventFilter.hpp
-    utility/system-info.hpp
-    utility/undo_stack.cpp
-    utility/undo_stack.hpp
     utility/VCamConfig.hpp
     utility/VolumeMeterTimer.cpp
     utility/VolumeMeterTimer.hpp
+    utility/audio-encoders.cpp
+    utility/audio-encoders.hpp
+    utility/display-helpers.hpp
+    utility/item-widget-helpers.cpp
+    utility/item-widget-helpers.hpp
+    utility/models/multitrack-video.hpp
+    utility/obf.c
+    utility/obf.h
+    utility/platform.hpp
+    utility/system-info.hpp
+    utility/undo_stack.cpp
+    utility/undo_stack.hpp
 )