[cmake] fix OpenGL, git rev identifier (#2530)

Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2530
Reviewed-by: MaranBr <maranbr@eden-emu.dev>

7 files changed, 21 insertions, 29 deletions

diff --git a/src/common/scm_rev.cpp.in b/src/common/scm_rev.cpp.in
index a157d03878..1630ceae83 100644
--- a/src/common/scm_rev.cpp.in
+++ b/src/common/scm_rev.cpp.in
@@ -6,8 +6,8 @@
 
 #include "common/scm_rev.h"
 
-#define GIT_REV "@GIT_REV@"
-#define GIT_BRANCH "@GIT_BRANCH@"
+#define GIT_REV "@GIT_COMMIT@"
+#define GIT_BRANCH "@GIT_REFSPEC@"
 #define GIT_DESC "@GIT_DESC@"
 #define BUILD_NAME "@REPO_NAME@"
 #define BUILD_DATE "@BUILD_DATE@"
@@ -31,7 +31,7 @@ constexpr const char g_build_version[] = BUILD_VERSION;
 constexpr const char g_build_id[] = BUILD_ID;
 constexpr const char g_title_bar_format_idle[] = TITLE_BAR_FORMAT_IDLE;
 constexpr const char g_title_bar_format_running[] = TITLE_BAR_FORMAT_RUNNING;
-constexpr const bool g_is_dev_build = IS_DEV_BUILD;
 constexpr const char g_compiler_id[] = COMPILER_ID;
+constexpr const bool g_is_dev_build = IS_DEV_BUILD;
 
 } // namespace Common
diff --git a/src/common/scm_rev.h b/src/common/scm_rev.h
index 84356ad64a..8f48241557 100644
--- a/src/common/scm_rev.h
+++ b/src/common/scm_rev.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: 2014 Citra Emulator Project
@@ -19,7 +19,7 @@ extern const char g_build_id[];
 extern const char g_title_bar_format_idle[];
 extern const char g_title_bar_format_running[];
 extern const char g_shader_cache_version[];
-extern const bool g_is_dev_build;
 extern const char g_compiler_id[];
+extern const bool g_is_dev_build;
 
 } // namespace Common
diff --git a/src/dynarmic/CMakeLists.txt b/src/dynarmic/CMakeLists.txt
index 38457deb50..a9808391ae 100644
--- a/src/dynarmic/CMakeLists.txt
+++ b/src/dynarmic/CMakeLists.txt
@@ -27,7 +27,7 @@ endif()
 option(DYNARMIC_FATAL_ERRORS "Errors are fatal" OFF)
 option(DYNARMIC_IGNORE_ASSERTS "Ignore asserts" OFF)
 option(DYNARMIC_TESTS_USE_UNICORN "Enable fuzzing tests against unicorn" OFF)
-option(DYNARMIC_USE_LLVM "Support disassembly of jitted x86_64 code using LLVM" OFF)
+CMAKE_DEPENDENT_OPTION(DYNARMIC_USE_LLVM "Support disassembly of jitted x86_64 code using LLVM" OFF "NOT YUZU_DISABLE_LLVM" OFF)
 
 if (PLATFORM_OPENBSD)
     option(DYNARMIC_USE_PRECOMPILED_HEADERS "Use precompiled headers" OFF)
diff --git a/src/qt_common/CMakeLists.txt b/src/qt_common/CMakeLists.txt
index 9d292da401..eb36de4cf2 100644
--- a/src/qt_common/CMakeLists.txt
+++ b/src/qt_common/CMakeLists.txt
@@ -40,7 +40,10 @@ endif()
 add_subdirectory(externals)
 
 target_link_libraries(qt_common PRIVATE core Qt6::Core SimpleIni::SimpleIni QuaZip::QuaZip frozen::frozen)
-target_link_libraries(qt_common PRIVATE Qt6::Core)
+
+if (NOT APPLE AND ENABLE_OPENGL)
+    target_compile_definitions(qt_common PUBLIC HAS_OPENGL)
+endif()
 
 if (NOT WIN32)
     target_include_directories(qt_common PRIVATE ${Qt6Gui_PRIVATE_INCLUDE_DIRS})
diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt
index 8a1d760c50..b16c1d99ce 100644
--- a/src/yuzu/CMakeLists.txt
+++ b/src/yuzu/CMakeLists.txt
@@ -480,10 +480,6 @@ if (MSVC)
     copy_yuzu_FFmpeg_deps(yuzu)
 endif()
 
-if (NOT APPLE AND ENABLE_OPENGL)
-    target_compile_definitions(yuzu PRIVATE HAS_OPENGL)
-endif()
-
 if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)
     target_link_libraries(yuzu PRIVATE dynarmic::dynarmic)
 endif()
diff --git a/src/yuzu/about_dialog.cpp b/src/yuzu/about_dialog.cpp
index c8edb90268..b7c0cd58d5 100644
--- a/src/yuzu/about_dialog.cpp
+++ b/src/yuzu/about_dialog.cpp
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -11,16 +14,11 @@ AboutDialog::AboutDialog(QWidget* parent)
     : QDialog(parent)
     , ui{std::make_unique<Ui::AboutDialog>()}
 {
-    static const std::string description = std::string(Common::g_build_version);
-    static const std::string build_id = std::string(Common::g_build_id);
-    static const std::string compiler = std::string(Common::g_compiler_id);
+    static const std::string description = std::string{Common::g_build_version};
+    static const std::string build_id = std::string{Common::g_build_id};
+    static const std::string compiler = std::string{Common::g_compiler_id};
 
-    std::string yuzu_build;
-    if (Common::g_is_dev_build) {
-        yuzu_build = fmt::format("Eden Nightly | {}-{} | {}", description, build_id, compiler);
-    } else {
-        yuzu_build = fmt::format("Eden | {} | {}", description, compiler);
-    }
+    static const std::string yuzu_build = fmt::format("Eden | {} | {}", description, compiler);
 
     const auto override_build = fmt::format(fmt::runtime(
                                                 std::string(Common::g_title_bar_format_idle)),
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index d7d4e94ab7..19162a4ab7 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -4205,16 +4205,11 @@ void GMainWindow::OnEmulatorUpdateAvailable() {
 
 void GMainWindow::UpdateWindowTitle(std::string_view title_name, std::string_view title_version,
                                     std::string_view gpu_vendor) {
-    static const std::string description = std::string(Common::g_build_version);
-    static const std::string build_id = std::string(Common::g_build_id);
-    static const std::string compiler = std::string(Common::g_compiler_id);
+    static const std::string description = std::string{Common::g_build_version};
+    static const std::string build_id = std::string{Common::g_build_id};
+    static const std::string compiler = std::string{Common::g_compiler_id};
 
-    std::string yuzu_title;
-    if (Common::g_is_dev_build) {
-        yuzu_title = fmt::format("Eden Nightly | {}-{} | {}", description, build_id, compiler);
-    } else {
-        yuzu_title = fmt::format("Eden | {} | {}", description, compiler);
-    }
+    static const std::string yuzu_title = fmt::format("Eden | {} | {}", description, compiler);
 
     const auto override_title =
         fmt::format(fmt::runtime(std::string(Common::g_title_bar_format_idle)), build_id);