Prepare CMake for Qt6 (#3103)
This commit is contained in:
+11
-11
@@ -486,16 +486,16 @@ add_library(${LIBRARY_PROJECT} OBJECT ${SOURCE_FILES})
|
||||
|
||||
target_link_libraries(${LIBRARY_PROJECT}
|
||||
PUBLIC
|
||||
Qt5::Core
|
||||
Qt5::Widgets
|
||||
Qt5::Gui
|
||||
Qt5::Network
|
||||
Qt5::Multimedia
|
||||
Qt5::Svg
|
||||
Qt5::Concurrent
|
||||
Qt${MAJOR_QT_VERSION}::Core
|
||||
Qt${MAJOR_QT_VERSION}::Widgets
|
||||
Qt${MAJOR_QT_VERSION}::Gui
|
||||
Qt${MAJOR_QT_VERSION}::Network
|
||||
Qt${MAJOR_QT_VERSION}::Multimedia
|
||||
Qt${MAJOR_QT_VERSION}::Svg
|
||||
Qt${MAJOR_QT_VERSION}::Concurrent
|
||||
|
||||
LibCommuni::LibCommuni
|
||||
qt5keychain
|
||||
qt${MAJOR_QT_VERSION}keychain
|
||||
Pajlada::Serialize
|
||||
Pajlada::Settings
|
||||
Pajlada::Signals
|
||||
@@ -524,8 +524,8 @@ if (BUILD_APP)
|
||||
)
|
||||
|
||||
if (MSVC)
|
||||
get_target_property(Qt5_Core_Location Qt5::Core LOCATION)
|
||||
get_filename_component(QT_BIN_DIR ${Qt5_Core_Location} DIRECTORY)
|
||||
get_target_property(Qt_Core_Location Qt${MAJOR_QT_VERSION}::Core LOCATION)
|
||||
get_filename_component(QT_BIN_DIR ${Qt_Core_Location} DIRECTORY)
|
||||
set(WINDEPLOYQT_COMMAND "${QT_BIN_DIR}/windeployqt.exe" $<TARGET_FILE:${EXECUTABLE_PROJECT}> --release --no-compiler-runtime --no-translations --no-opengl-sw)
|
||||
|
||||
install(TARGETS ${EXECUTABLE_PROJECT}
|
||||
@@ -582,7 +582,7 @@ target_compile_definitions(${LIBRARY_PROJECT} PUBLIC
|
||||
CHATTERINO_GIT_RELEASE=\"${GIT_RELEASE}\"
|
||||
CHATTERINO_GIT_COMMIT=\"${GIT_COMMIT}\"
|
||||
)
|
||||
if (USE_SYSTEM_QT5KEYCHAIN)
|
||||
if (USE_SYSTEM_QTKEYCHAIN)
|
||||
target_compile_definitions(${LIBRARY_PROJECT} PUBLIC
|
||||
CMAKE_BUILD
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user