redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-04-20 19:57:45 +00:00
Code Activity

Fix up CMake a bit

Browse source
This commit is contained in:
Joshua Goins 2023-09-17 09:31:25 -04:00
parent 2c691c35be
commit 34886cf991
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
launcher/CMakeLists.txt
View file

@ -40,7 +40,9 @@ target_sources(astra PRIVATE
src/squareboot.cpp src/squareboot.cpp
src/squarelauncher.cpp src/squarelauncher.cpp
src/steamapi.cpp src/steamapi.cpp
src/utility.cpp) src/utility.cpp
)
qt_target_qml_sources(astra qt_target_qml_sources(astra
QML_FILES QML_FILES
ui/Components/FormFileDelegate.qml ui/Components/FormFileDelegate.qml
@ -68,12 +70,12 @@ qt_target_qml_sources(astra
ui/Setup/SetupPage.qml ui/Setup/SetupPage.qml
ui/Main.qml ui/Main.qml
) )
kconfig_add_kcfg_files(astra GENERATE_MOC config.kcfgc accountconfig.kcfgc profileconfig.kcfgc) kconfig_add_kcfg_files(astra GENERATE_MOC config.kcfgc accountconfig.kcfgc profileconfig.kcfgc)
target_include_directories(astra PRIVATE include ${CMAKE_BINARY_DIR}) target_include_directories(astra PRIVATE include ${CMAKE_BINARY_DIR})
target_link_libraries(astra PRIVATE target_link_libraries(astra PRIVATE
physis physis
cotp cotp
crypto
QuaZip::QuaZip QuaZip::QuaZip
Qt6Keychain::Qt6Keychain Qt6Keychain::Qt6Keychain
Qt6::Core Qt6::Core
@ -127,7 +129,7 @@ endif ()
install(TARGETS astra ${KF${QT_MAJOR_VERSION}_INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS astra ${KF${QT_MAJOR_VERSION}_INSTALL_TARGETS_DEFAULT_ARGS})
if (WIN32) if (WIN32)
get_target_property(QMAKE_EXE Qt5::qmake IMPORTED_LOCATION) get_target_property(QMAKE_EXE Qt6::qmake IMPORTED_LOCATION)
get_filename_component(QT_BIN_DIR "${QMAKE_EXE}" DIRECTORY) get_filename_component(QT_BIN_DIR "${QMAKE_EXE}" DIRECTORY)
find_program(WINDEPLOYQT_ENV_SETUP qtenv2.bat HINTS "${QT_BIN_DIR}") find_program(WINDEPLOYQT_ENV_SETUP qtenv2.bat HINTS "${QT_BIN_DIR}")