This commit is contained in:
tooomm 2026-07-04 17:32:00 +02:00
parent 73626c98a6
commit 8715a403b3

View file

@ -51,15 +51,10 @@ if(WIN32 OR USE_VCPKG)
# Use vcpkg toolchain on Windows (and on macOS in CI) # Use vcpkg toolchain on Windows (and on macOS in CI)
set(CMAKE_TOOLCHAIN_FILE set(CMAKE_TOOLCHAIN_FILE
${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake ${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 # Check if Qt path is set by user or env var
if(QTDIR if(NOT QTDIR AND NOT DEFINED ENV{QTDIR})
OR DEFINED ENV{QTDIR}
OR DEFINED ENV{QTDIR64}
)
else()
set(QTDIR set(QTDIR
"" ""
CACHE PATH "Path to Qt (e.g. C:/Qt/5.7/msvc2015_64)" CACHE PATH "Path to Qt (e.g. C:/Qt/5.7/msvc2015_64)"
@ -196,20 +191,16 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
add_definitions("-DSFMT_MEXP=19937") add_definitions("-DSFMT_MEXP=19937")
endif() endif()
find_package(Qt6 6.4 REQUIRED)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
if(DEFINED QTDIR${_lib_suffix}) if(DEFINED QTDIR)
list(APPEND CMAKE_PREFIX_PATH "${QTDIR${_lib_suffix}}")
elseif(DEFINED QTDIR)
list(APPEND CMAKE_PREFIX_PATH "${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}) elseif(DEFINED ENV{QTDIR})
list(APPEND CMAKE_PREFIX_PATH "$ENV{QTDIR}") list(APPEND CMAKE_PREFIX_PATH "$ENV{QTDIR}")
endif() endif()
find_package(Qt6 6.4 REQUIRED)
message(STATUS "Update Translations: ${UPDATE_TRANSLATIONS}") message(STATUS "Update Translations: ${UPDATE_TRANSLATIONS}")
include(FindQtRuntime) include(FindQtRuntime)