kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-05-20 11:59:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix som Cmake (add_definitions)

Browse Source 
add_definitions(-DGIT_COMMIT_SHA=${GIT_COMMIT_SHA})
-DGIT_COMMIT_SHA=GIT_COMMIT_SHA
This commit is contained in:
Simon De Backer
2020-12-11 00:16:49 +01:00
parent 6da9c58458
commit eb49977c75
1 changed files with 83 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

158
CMakeLists.txt
View File

@@ -52,11 +52,20 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(QET_DIR ${PROJECT_SOURCE_DIR}) set(QET_DIR ${PROJECT_SOURCE_DIR})
set(TODO_LIST)
add_definitions(-DTODO_LIST)
execute_process( execute_process(
COMMAND git -C ${QET_DIR} rev-parse --verify HEAD COMMAND git -C ${QET_DIR} rev-parse --verify HEAD
OUTPUT_VARIABLE GIT_COMMIT_SHA) OUTPUT_VARIABLE GIT_COMMIT_SHA)
add_definitions(-DGIT_COMMIT_SHA -D${GIT_COMMIT_SHA})
# This strips terminating newline in the variable
string(REGEX REPLACE "\n$" "" GIT_COMMIT_SHA "${GIT_COMMIT_SHA}")
# This adds to definitions => .cpp
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})
message("QET_DIR :" ${QET_DIR}) message("QET_DIR :" ${QET_DIR})
@@ -76,13 +85,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
@@ -96,55 +105,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
@@ -657,25 +666,25 @@ set(QET_SRC_FILES
${QET_DIR}/sources/utils/qetutils.h ${QET_DIR}/sources/utils/qetutils.h
) )
add_executable( #add_executable(
${PROJECT_NAME} # ${PROJECT_NAME}
${QET_SRC_FILES} # ${QET_SRC_FILES}
${QM_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( #target_link_libraries(
# ${PROJECT_NAME} # ${PROJECT_NAME}
@@ -727,8 +736,7 @@ target_link_libraries(
# ${QET_DIR}/sources/print # ${QET_DIR}/sources/print
# ) # )
# Add sub directories # Add sub directories
message("Add sub directorie tests") message("Add sub directorie tests")
add_subdirectory(tests) add_subdirectory(tests)