From 8715a403b3571dc49b2d34cb185dc888f3296eb0 Mon Sep 17 00:00:00 2001
From: tooomm <tooomm@users.noreply.github.com>
Date: Sat, 4 Jul 2026 17:32:00 +0200
Subject: [PATCH] QTDIRxx

---
 CMakeLists.txt | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 92a1be373..15a34342b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,21 +51,16 @@ if(WIN32 OR USE_VCPKG)
   # Use vcpkg toolchain on Windows (and on macOS in CI)
   set(CMAKE_TOOLCHAIN_FILE
       ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake
-      CACHE STRING "Vcpkg toolchain file"
+      CACHE FILEPATH "Vcpkg toolchain file"
   )
-  # Qt path set by user or env var
-  if(QTDIR
-     OR DEFINED ENV{QTDIR}
-     OR DEFINED ENV{QTDIR64}
-  )
-
-  else()
+  # Check if Qt path is set by user or env var
+  if(NOT QTDIR AND NOT DEFINED ENV{QTDIR})
     set(QTDIR
         ""
         CACHE PATH "Path to Qt (e.g. C:/Qt/5.7/msvc2015_64)"
     )
     message(
-      WARNING "QTDIR variable is missing.  Please set this variable to specify path to Qt (e.g. C:/Qt/5.7/msvc2015_64)"
+      WARNING "QTDIR variable is missing. Please set this variable to specify path to Qt (e.g. C:/Qt/5.7/msvc2015_64)"
     )
   endif()
 endif()
@@ -196,20 +191,16 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
   add_definitions("-DSFMT_MEXP=19937")
 endif()
 
-find_package(Qt6 6.4 REQUIRED)
-
 find_package(Threads REQUIRED)
 
-if(DEFINED QTDIR${_lib_suffix})
-  list(APPEND CMAKE_PREFIX_PATH "${QTDIR${_lib_suffix}}")
-elseif(DEFINED QTDIR)
+if(DEFINED QTDIR)
   list(APPEND CMAKE_PREFIX_PATH "${QTDIR}")
-elseif(DEFINED ENV{QTDIR${_lib_suffix}})
-  list(APPEND CMAKE_PREFIX_PATH "$ENV{QTDIR${_lib_suffix}}")
 elseif(DEFINED ENV{QTDIR})
   list(APPEND CMAKE_PREFIX_PATH "$ENV{QTDIR}")
 endif()
 
+find_package(Qt6 6.4 REQUIRED)
+
 message(STATUS "Update Translations: ${UPDATE_TRANSLATIONS}")
 
 include(FindQtRuntime)