kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-18 13:30:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix more Cmake + Mod pragma message

Browse Source
This commit is contained in:
Simon De Backer
2020-12-11 00:45:43 +01:00
parent eb49977c75
commit 62b71c0ba5
2 changed files with 100 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

183
CMakeLists.txt
View File

@@ -52,9 +52,12 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(QET_DIR ${PROJECT_SOURCE_DIR}) set(QET_DIR ${PROJECT_SOURCE_DIR})
# You can make your code warn on compile time for the TODO's
# In order to do so, uncomment the following line.
#add_definitions(-DTODO_LIST)
# From De-Backer ik ben nog aan het testen.
add_definitions(-DTODO_LIST) #set(BUILD_QET_YES "yes")
execute_process( execute_process(
COMMAND git -C ${QET_DIR} rev-parse --verify HEAD COMMAND git -C ${QET_DIR} rev-parse --verify HEAD
@@ -64,7 +67,7 @@ execute_process(
string(REGEX REPLACE "\n$" "" GIT_COMMIT_SHA "${GIT_COMMIT_SHA}") string(REGEX REPLACE "\n$" "" GIT_COMMIT_SHA "${GIT_COMMIT_SHA}")
# This adds to definitions => .cpp # This adds to definitions => .cpp
add_definitions(-DGIT_COMMIT_SHA=${GIT_COMMIT_SHA}) add_definitions(-DGIT_COMMIT_SHA="${GIT_COMMIT_SHA}")
message("PROJECT_NAME :" ${PROJECT_NAME}) message("PROJECT_NAME :" ${PROJECT_NAME})
message("PROJECT_SOURCE_DIR :" ${PROJECT_SOURCE_DIR}) message("PROJECT_SOURCE_DIR :" ${PROJECT_SOURCE_DIR})
@@ -85,13 +88,13 @@ find_package(KF5CoreAddons)
#___ToDo #___ToDo
#find_package(KF5WidgetsAddons) find_package(KF5WidgetsAddons)
FetchContent_Declare( #FetchContent_Declare(
kwidgetsaddons # kwidgetsaddons
GIT_REPOSITORY https://invent.kde.org/frameworks/kwidgetsaddons.git # GIT_REPOSITORY https://invent.kde.org/frameworks/kwidgetsaddons.git
GIT_TAG ${KF5_GIT_TAG}) # GIT_TAG ${KF5_GIT_TAG})
FetchContent_MakeAvailable(kwidgetsaddons) #FetchContent_MakeAvailable(kwidgetsaddons)
set(QET_COMPONENTS set(QET_COMPONENTS
Widgets Widgets
@@ -105,55 +108,55 @@ set(QET_COMPONENTS
message("QET_COMPONENTS :" ${QET_COMPONENTS}) message("QET_COMPONENTS :" ${QET_COMPONENTS})
#find_package( find_package(
# QT QT
# NAMES NAMES
# Qt6 Qt6
# Qt5 Qt5
# COMPONENTS COMPONENTS
# ${QET_COMPONENTS} ${QET_COMPONENTS}
# REQUIRED REQUIRED
# ) )
#message("QT_VERSION_MAJOR :" ${QT_VERSION_MAJOR}) message("QT_VERSION_MAJOR :" ${QT_VERSION_MAJOR})
#find_package( find_package(
# Qt${QT_VERSION_MAJOR} Qt${QT_VERSION_MAJOR}
# COMPONENTS COMPONENTS
# ${QET_COMPONENTS} ${QET_COMPONENTS}
# REQUIRED) REQUIRED)
#qt5_create_translation( qt5_create_translation(
# QM_FILES QM_FILES
# ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
# ${QET_DIR}/lang/qet_ca.ts ${QET_DIR}/lang/qet_ca.ts
# ${QET_DIR}/lang/qet_de.ts ${QET_DIR}/lang/qet_de.ts
# ${QET_DIR}/lang/qet_es.ts ${QET_DIR}/lang/qet_es.ts
# ${QET_DIR}/lang/qet_fr.ts ${QET_DIR}/lang/qet_fr.ts
# ${QET_DIR}/lang/qet_it.ts ${QET_DIR}/lang/qet_it.ts
# ${QET_DIR}/lang/qet_mn.ts ${QET_DIR}/lang/qet_mn.ts
# ${QET_DIR}/lang/qet_pt_br.ts ${QET_DIR}/lang/qet_pt_br.ts
# ${QET_DIR}/lang/qet_ru.ts ${QET_DIR}/lang/qet_ru.ts
# ${QET_DIR}/lang/qet_sr.ts ${QET_DIR}/lang/qet_sr.ts
# ${QET_DIR}/lang/qet_zh.ts ${QET_DIR}/lang/qet_zh.ts
# ${QET_DIR}/lang/qet_be.ts ${QET_DIR}/lang/qet_be.ts
# ${QET_DIR}/lang/qet_da.ts ${QET_DIR}/lang/qet_da.ts
# ${QET_DIR}/lang/qet_en.ts ${QET_DIR}/lang/qet_en.ts
# ${QET_DIR}/lang/qet_fi.ts ${QET_DIR}/lang/qet_fi.ts
# ${QET_DIR}/lang/qet_hu.ts ${QET_DIR}/lang/qet_hu.ts
# ${QET_DIR}/lang/qet_nl.ts ${QET_DIR}/lang/qet_nl.ts
# ${QET_DIR}/lang/qet_pl.ts ${QET_DIR}/lang/qet_pl.ts
# ${QET_DIR}/lang/qet_ro.ts ${QET_DIR}/lang/qet_ro.ts
# ${QET_DIR}/lang/qet_sk.ts ${QET_DIR}/lang/qet_sk.ts
# ${QET_DIR}/lang/qet_ar.ts ${QET_DIR}/lang/qet_ar.ts
# ${QET_DIR}/lang/qet_cs.ts ${QET_DIR}/lang/qet_cs.ts
# ${QET_DIR}/lang/qet_el.ts ${QET_DIR}/lang/qet_el.ts
# ${QET_DIR}/lang/qet_hr.ts ${QET_DIR}/lang/qet_hr.ts
# ${QET_DIR}/lang/qet_ja.ts ${QET_DIR}/lang/qet_ja.ts
# ${QET_DIR}/lang/qet_nb.ts ${QET_DIR}/lang/qet_nb.ts
# ${QET_DIR}/lang/qet_no.ts ${QET_DIR}/lang/qet_no.ts
# ${QET_DIR}/lang/qet_pt.ts ${QET_DIR}/lang/qet_pt.ts
# ${QET_DIR}/lang/qet_sl.ts ${QET_DIR}/lang/qet_sl.ts
# ${QET_DIR}/lang/qet_tr.ts) ${QET_DIR}/lang/qet_tr.ts)
set(QET_SRC_FILES set(QET_SRC_FILES
${QET_DIR}/sources/borderproperties.cpp ${QET_DIR}/sources/borderproperties.cpp
@@ -666,40 +669,44 @@ set(QET_SRC_FILES
${QET_DIR}/sources/utils/qetutils.h ${QET_DIR}/sources/utils/qetutils.h
) )
#add_executable( if(DEFINED BUILD_QET_YES)
# ${PROJECT_NAME} message("!! TESTING TESTING TESTING TESTING TESTING !!")
# ${QET_SRC_FILES} add_executable(
# ${QM_FILES} ${PROJECT_NAME}
# ) ${QET_SRC_FILES}
${QM_FILES}
)
#target_link_libraries( target_link_libraries(
# ${PROJECT_NAME} ${PROJECT_NAME}
# PUBLIC PUBLIC
# PRIVATE PRIVATE
# Qt${QT_VERSION_MAJOR}::Xml Qt${QT_VERSION_MAJOR}::Xml
# Qt${QT_VERSION_MAJOR}::Svg Qt${QT_VERSION_MAJOR}::Svg
# Qt${QT_VERSION_MAJOR}::Network Qt${QT_VERSION_MAJOR}::Network
# Qt${QT_VERSION_MAJOR}::Sql Qt${QT_VERSION_MAJOR}::Sql
# Qt${QT_VERSION_MAJOR}::PrintSupport Qt${QT_VERSION_MAJOR}::PrintSupport
# Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Widgets
# Qt${QT_VERSION_MAJOR}::Concurrent Qt${QT_VERSION_MAJOR}::Concurrent
# KF5::WidgetsAddons KF5::WidgetsAddons
# KF5::CoreAddons) KF5::CoreAddons)
#target_link_libraries(
# ${PROJECT_NAME}
# PUBLIC
# PRIVATE
# KF5::WidgetsAddons
# KF5::CoreAddons
# Qt5::Gui
# Qt5::Xml
# Qt5::Svg
# Qt5::Network
# Qt5::Sql
# Qt5::Widgets
# Qt5::Concurrent)
target_link_libraries(
${PROJECT_NAME}
PUBLIC
PRIVATE
KF5::WidgetsAddons
KF5::CoreAddons
Qt5::Gui
Qt5::Xml
Qt5::Svg
Qt5::Network
Qt5::Sql
Qt5::Widgets
Qt5::Concurrent)
else()
message("!! sorry now Cmake can't get QET builds yet !!")
endif()
# target_include_directories( # target_include_directories(
# ${PROJECT_NAME} # ${PROJECT_NAME}
# PRIVATE # PRIVATE

6
sources/qetmainwindow.cpp
View File

@@ -62,7 +62,11 @@ void QETMainWindow::initCommonActions()
{ {
qet_app->configureQET(); qet_app->configureQET();
#if TODO_LIST #if TODO_LIST
#pragma message("@TODO we use reloadOldElementPanel only to keep up to date the string of the folio in the old element panel. then, if user change the option "Use labels of folio instead of their ID" the string of folio in the old element panel is up to date") # pragma message("@TODO we use reloadOldElementPanel only to keep up to ")
# pragma message("datethe string of the folio in the old element panel.")
# pragma message("then,if user change the option")
# pragma message(" 'Use labels of folio instead of their ID' the string")
# pragma message(" of folio in the old element panel is up to date")
#endif #endif
//TODO we use reloadOldElementPanel only to keep up to date the string of the folio in the old element panel. //TODO we use reloadOldElementPanel only to keep up to date the string of the folio in the old element panel.
//then, if user change the option "Use labels of folio instead of their ID" the string of folio in the old element panel is up to date //then, if user change the option "Use labels of folio instead of their ID" the string of folio in the old element panel is up to date