From a700dcdfb0b76a69aef8d3bd7dccaf7b376ce445 Mon Sep 17 00:00:00 2001
From: Solomon Peachy <pizza@shaftnet.org>
Date: Sat, 27 Jun 2026 07:27:29 -0400
Subject: [PATCH] rbutil:  Use add_compile_definitions instead of
 add_compile_options

Change-Id: Iaeca86f89ccfb961456a10b96f3257d444cc0971
---
 utils/CMakeLists.txt             | 2 +-
 utils/rbutilqt/CMakeLists.txt    | 3 ++-
 utils/themeeditor/CMakeLists.txt | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 2d0541f89f..0e47249498 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -59,7 +59,7 @@ else()
   message("-- QT::Multimedia not found, TTS preview not available")
 endif()
 
-add_compile_options(-DQT_NO_USE_NODISCARD_FILE_OPEN)
+add_compile_definitions(QT_NO_USE_NODISCARD_FILE_OPEN)
 
 # If we're on Linux, try to find the used libs in the system.
 if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
diff --git a/utils/rbutilqt/CMakeLists.txt b/utils/rbutilqt/CMakeLists.txt
index fea6c30010..8d2374c926 100644
--- a/utils/rbutilqt/CMakeLists.txt
+++ b/utils/rbutilqt/CMakeLists.txt
@@ -13,6 +13,8 @@
 # KIND, either express or implied.
 #
 
+add_compile_definitions(QT_NO_USE_NODISCARD_FILE_OPEN)
+
 set(RBUTIL_TS_FILES
     ${CMAKE_CURRENT_LIST_DIR}/lang/rbutil_cs.ts
     ${CMAKE_CURRENT_LIST_DIR}/lang/rbutil_de.ts
@@ -103,7 +105,6 @@ add_executable(RockboxUtility WIN32 MACOSX_BUNDLE
     )
 
 target_compile_features(RockboxUtility PRIVATE cxx_std_17 c_std_11)
-target_compile_options(RockboxUtility PRIVATE -DQT_NO_USE_NODISCARD_FILE_OPEN)
 
 if(WIN32)
     target_sources(RockboxUtility PRIVATE
diff --git a/utils/themeeditor/CMakeLists.txt b/utils/themeeditor/CMakeLists.txt
index dae09d6d0c..8720ada7c3 100644
--- a/utils/themeeditor/CMakeLists.txt
+++ b/utils/themeeditor/CMakeLists.txt
@@ -13,6 +13,8 @@
 # KIND, either express or implied.
 #
 
+add_compile_definitions(QT_NO_USE_NODISCARD_FILE_OPEN)
+
 add_executable(RockboxThemeEditor WIN32 MACOSX_BUNDLE
     graphics/rbalbumart.cpp
     graphics/rbalbumart.h
@@ -111,7 +113,6 @@ set_target_properties(RockboxThemeEditor PROPERTIES AUTORCC ON)
 set_target_properties(RockboxThemeEditor PROPERTIES AUTOUIC ON)
 
 target_compile_features(RockboxThemeEditor PRIVATE cxx_std_17 c_std_11)
-target_compile_options(RockboxThemeEditor PRIVATE -DQT_NO_USE_NODISCARD_FILE_OPEN)
 
 target_link_libraries(RockboxThemeEditor
     Qt${QT_VERSION_MAJOR}::Network Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Core