mirror of
https://github.com/chris2511/xca.git
synced 2026-09-12 19:51:05 +05:00
Windows/Mac build: switch to QT 6.6.3
and fix a minor typo
This commit is contained in:
parent
add0be8b0b
commit
b21221304b
@ -111,7 +111,7 @@ elseif(WIN32)
|
||||
file(TO_CMAKE_PATH $ENV{WINDIR}/system32 SYSTEM32)
|
||||
endif()
|
||||
|
||||
set(QTFIXEDVERSION Qt6 Qt5 CACHE STRING "Force q specific QT version 'Qt5' or 'Qt6'")
|
||||
set(QTFIXEDVERSION Qt6 Qt5 CACHE STRING "Force a specific QT version 'Qt5' or 'Qt6'")
|
||||
find_package(OpenSSL REQUIRED)
|
||||
find_package(QT NAMES ${QTFIXEDVERSION} REQUIRED COMPONENTS Core)
|
||||
set(QT Qt${QT_VERSION_MAJOR})
|
||||
|
||||
@ -65,7 +65,7 @@ OSSL_MAJOR="3"
|
||||
OSSL="openssl-3.1.5"
|
||||
XCA_DIR="$(cd `dirname $0`/.. && pwd)"
|
||||
TOP_DIR="`dirname $XCA_DIR`"
|
||||
QT_DIR="$TOP_DIR/6.6.2/macos"
|
||||
QT_DIR="$TOP_DIR/6.6.3/macos"
|
||||
|
||||
BUILDDIR="$TOP_DIR/osx-release-dmg"
|
||||
BUILDDIR_APPSTORE="$TOP_DIR/osx-release-appstore"
|
||||
|
||||
@ -16,7 +16,7 @@ do_openssl() {
|
||||
OSSL="openssl-3.1.5"
|
||||
XCA_DIR="$(cd `dirname $0`/.. && pwd)"
|
||||
TOP_DIR="`dirname $XCA_DIR`"
|
||||
QT_DIR="$TOP_DIR/QT/6.6.2/mingw_64"
|
||||
QT_DIR="$TOP_DIR/QT/6.6.3/mingw_64"
|
||||
BUILDDIR="$TOP_DIR/w64-release"
|
||||
INSTALL_DIR="/c/OpenSSL"
|
||||
JOBS=7
|
||||
|
||||
Loading…
Reference in New Issue
Block a user