Made available compilation on windows with msys2

The aim of this commit is to easily build qelectrotech under windows
with qt6/cmake and the package tool MSYS2.

-Update some cmake file.
-Remove Git submodule for pugixml and single application
-Use cmake find_package for pugi xml
-Use cmake fetchContent for single application.
-Use cmake find_package for KCoreAddons and KWidgetsAddons.
-Minor change for pugi xml
-Minor change on ProjectPrintWindow class to compatible with Qt6 API.
This commit is contained in:
joshua
2026-03-02 22:34:16 +01:00
parent 5f318e09c8
commit fedc1cb092
11 changed files with 67 additions and 86 deletions

View File

@@ -45,11 +45,12 @@ endif()
include(cmake/paths_compilation_installation.cmake)
include(cmake/start_options.cmake)
include(cmake/developer_options.cmake)
include(cmake/git_update_submodules.cmake)
#include(cmake/git_update_submodules.cmake)
include(cmake/git_last_commit_sha.cmake)
include(cmake/fetch_kdeaddons.cmake)
include(cmake/fetch_singleapplication.cmake)
include(cmake/fetch_pugixml.cmake)
include(cmake/fetch_elements.cmake)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -57,11 +58,8 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC_SEARCH_PATHS ${QET_DIR}/sources/ui)
# als laatse
include(cmake/define_definitions.cmake)
find_package(KF6WidgetsAddons REQUIRED)
qt_add_executable(
${PROJECT_NAME}
${QET_RES_FILES}
@@ -89,7 +87,6 @@ target_link_libraries(
SQLite::SQLite3
${KF6_PRIVATE_LIBRARIES}
${QET_PRIVATE_LIBRARIES}
KF6::WidgetsAddons
)
target_include_directories(
@@ -121,7 +118,6 @@ target_include_directories(
${QET_DIR}/sources/NameList
${QET_DIR}/sources/NameList/ui
${QET_DIR}/sources/utils
${QET_DIR}/pugixml/src
${QET_DIR}/sources/dataBase
${QET_DIR}/sources/dataBase/ui
${QET_DIR}/sources/factory/ui