mirror of
https://github.com/ciphervance/supercell-wx.git
synced 2025-10-30 17:50:04 +00:00
Merge branch 'develop' into feature/conan-2
This commit is contained in:
commit
e3fa3fdd61
8 changed files with 205 additions and 13 deletions
|
|
@ -21,9 +21,7 @@ find_package(Python COMPONENTS Interpreter)
|
|||
find_package(SQLite3)
|
||||
|
||||
find_package(QT NAMES Qt6
|
||||
COMPONENTS BuildInternals
|
||||
Core
|
||||
Gui
|
||||
COMPONENTS Gui
|
||||
LinguistTools
|
||||
Multimedia
|
||||
Network
|
||||
|
|
@ -37,9 +35,7 @@ find_package(QT NAMES Qt6
|
|||
REQUIRED)
|
||||
|
||||
find_package(Qt${QT_VERSION_MAJOR}
|
||||
COMPONENTS BuildInternals
|
||||
Core
|
||||
Gui
|
||||
COMPONENTS Gui
|
||||
LinguistTools
|
||||
Multimedia
|
||||
Network
|
||||
|
|
@ -510,6 +506,7 @@ source_group("I18N Files" FILES ${TS_FILES})
|
|||
|
||||
add_library(scwx-qt OBJECT ${PROJECT_SOURCES})
|
||||
set_property(TARGET scwx-qt PROPERTY AUTOMOC ON)
|
||||
set_property(TARGET scwx-qt PROPERTY AUTOGEN_ORIGIN_DEPENDS OFF)
|
||||
|
||||
add_custom_command(OUTPUT ${COUNTIES_SQLITE_DB}
|
||||
COMMAND ${Python_EXECUTABLE}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue