diff --git a/CMakeLists.txt b/CMakeLists.txt index 57ab521e2..196f65805 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,36 +52,37 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) set(QET_DIR ${PROJECT_SOURCE_DIR}) +set(TODO_LIST) execute_process( COMMAND git -C ${QET_DIR} rev-parse --verify HEAD OUTPUT_VARIABLE GIT_COMMIT_SHA) -message("PROJECT_NAME: " ${PROJECT_NAME}) -message("PROJECT_SOURCE_DIR: " ${PROJECT_SOURCE_DIR}) -message("QET_DIR: " ${QET_DIR}) -message("GIT_COMMIT_SHA: " ${GIT_COMMIT_SHA}) - +message("PROJECT_NAME :" ${PROJECT_NAME}) +message("PROJECT_SOURCE_DIR :" ${PROJECT_SOURCE_DIR}) +message("QET_DIR :" ${QET_DIR}) +message("GIT_COMMIT_SHA :" ${GIT_COMMIT_SHA}) Include(FetchContent) +set(KF5_GIT_TAG v5.76.0) +message("KF5_GIT_TAG :" ${KF5_GIT_TAG}) find_package(KF5CoreAddons) #---ToDo why you don't work :/ #FetchContent_Declare( # kcoreaddons # GIT_REPOSITORY https://invent.kde.org/frameworks/kcoreaddons.git -# GIT_TAG v5.76.0) +# GIT_TAG ${KF5_GIT_TAG}) #FetchContent_MakeAvailable(kcoreaddons) #___ToDo -#find_package(KF5WidgetsAddons) -FetchContent_Declare( - kwidgetsaddons - GIT_REPOSITORY https://invent.kde.org/frameworks/kwidgetsaddons.git - GIT_TAG v5.76.0) - -FetchContent_MakeAvailable(kwidgetsaddons) +find_package(KF5WidgetsAddons) +#FetchContent_Declare( +# kwidgetsaddons +# GIT_REPOSITORY https://invent.kde.org/frameworks/kwidgetsaddons.git +# GIT_TAG ${KF5_GIT_TAG}) +#FetchContent_MakeAvailable(kwidgetsaddons) set(QET_COMPONENTS Widgets @@ -93,6 +94,8 @@ set(QET_COMPONENTS PrintSupport LinguistTools) +message("QET_COMPONENTS :" ${QET_COMPONENTS}) + find_package( QT NAMES @@ -102,6 +105,7 @@ find_package( ${QET_COMPONENTS} REQUIRED ) +message("QT_VERSION_MAJOR :" ${QT_VERSION_MAJOR}) find_package( Qt${QT_VERSION_MAJOR} @@ -111,6 +115,7 @@ find_package( qt5_create_translation( QM_FILES + ${CMAKE_SOURCE_DIR} ${QET_DIR}/lang/qet_ca.ts ${QET_DIR}/lang/qet_de.ts ${QET_DIR}/lang/qet_es.ts @@ -141,9 +146,6 @@ qt5_create_translation( ${QET_DIR}/lang/qet_sl.ts ${QET_DIR}/lang/qet_tr.ts) - -message("QT_VERSION_MAJOR :" ${QT_VERSION_MAJOR}) - set(QET_SRC_FILES ${QET_DIR}/sources/borderproperties.cpp ${QET_DIR}/sources/borderproperties.h @@ -655,25 +657,25 @@ set(QET_SRC_FILES ${QET_DIR}/sources/utils/qetutils.h ) -#add_executable( -# ${PROJECT_NAME} -# ${QET_SRC_FILES} -# ${QM_FILES} -# ) +add_executable( + ${PROJECT_NAME} + ${QET_SRC_FILES} + ${QM_FILES} + ) -#target_link_libraries( -# ${PROJECT_NAME} -# PUBLIC -# PRIVATE -# Qt${QT_VERSION_MAJOR}::Xml -# Qt${QT_VERSION_MAJOR}::Svg -# Qt${QT_VERSION_MAJOR}::Network -# Qt${QT_VERSION_MAJOR}::Sql -# Qt${QT_VERSION_MAJOR}::PrintSupport -# Qt${QT_VERSION_MAJOR}::Widgets -# Qt${QT_VERSION_MAJOR}::Concurrent -# KF5::WidgetsAddons -# KF5::CoreAddons) +target_link_libraries( + ${PROJECT_NAME} + PUBLIC + PRIVATE + Qt${QT_VERSION_MAJOR}::Xml + Qt${QT_VERSION_MAJOR}::Svg + Qt${QT_VERSION_MAJOR}::Network + Qt${QT_VERSION_MAJOR}::Sql + Qt${QT_VERSION_MAJOR}::PrintSupport + Qt${QT_VERSION_MAJOR}::Widgets + Qt${QT_VERSION_MAJOR}::Concurrent + KF5::WidgetsAddons + KF5::CoreAddons) #target_link_libraries( # ${PROJECT_NAME} @@ -728,4 +730,5 @@ set(QET_SRC_FILES # Add sub directories +message("Add sub directorie tests") add_subdirectory(tests) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index c0268d005..257a19183 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -16,15 +16,18 @@ cmake_minimum_required(VERSION 3.5) -message("_____________________________________________________________________") +message(".____________________________________________________________________") project(unittests LANGUAGES CXX) -message("PROJECT_NAME: " ${PROJECT_NAME}) -message("PROJECT_SOURCE_DIR: " ${PROJECT_SOURCE_DIR}) -message("QET_DIR: " ${QET_DIR}) +message(". PROJECT_NAME: " ${PROJECT_NAME}) +message(". PROJECT_SOURCE_DIR: " ${PROJECT_SOURCE_DIR}) # Add sub directories -add_subdirectory(qttest) +message(". Add sub directorie catch") add_subdirectory(catch) +message(". Add sub directorie googletest") add_subdirectory(googletest) +message(". Add sub directorie googlemock") add_subdirectory(googlemock) +message(". Add sub directorie qttest") +add_subdirectory(qttest) diff --git a/tests/catch/CMakeLists.txt b/tests/catch/CMakeLists.txt index 3e9f6814c..aca806e9e 100644 --- a/tests/catch/CMakeLists.txt +++ b/tests/catch/CMakeLists.txt @@ -16,7 +16,7 @@ cmake_minimum_required(VERSION 3.5) -message("_____________________________________________________________________") +message("..___________________________________________________________________") project(C_unittests LANGUAGES CXX) @@ -29,8 +29,14 @@ set(CMAKE_AUTOUIC ON) SET(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -if(DEFINED ENV{QET_DIR}) +message(".. PROJECT_NAME :" ${PROJECT_NAME}) +message(".. PROJECT_SOURCE_DIR :" ${PROJECT_SOURCE_DIR}) +if(NOT DEFINED QET_DIR) set(QET_DIR "../..") + message(".. QET_DIR is not set, assuming QET is ../..") +endif() +message(".. QET_DIR :" ${QET_DIR}) +if(NOT DEFINED QET_COMPONENTS) set(QET_COMPONENTS Widgets Concurrent @@ -40,22 +46,20 @@ if(DEFINED ENV{QET_DIR}) Sql PrintSupport LinguistTools) - message("QET_DIR is not set, assuming QET is ../..") + message(".. QET_COMPONENTS is not set !!! I set them up !!!") endif() - -message("PROJECT_NAME: " ${PROJECT_NAME}) -message("PROJECT_SOURCE_DIR: " ${PROJECT_SOURCE_DIR}) -message("QET_DIR: " ${QET_DIR}) - -find_package( - QT - NAMES - Qt6 - Qt5 - COMPONENTS - ${QET_COMPONENTS} - REQUIRED - ) +if(NOT DEFINED QT_VERSION_MAJOR) + find_package( + QT + NAMES + Qt6 + Qt5 + COMPONENTS + ${QET_COMPONENTS} + REQUIRED + ) +endif() +message(".. QT_VERSION_MAJOR :" ${QT_VERSION_MAJOR}) find_package( Qt${QT_VERSION_MAJOR} @@ -72,19 +76,24 @@ FetchContent_Declare( FetchContent_MakeAvailable(Catch2) +if(NOT DEFINED KF5_GIT_TAG) + set(KF5_GIT_TAG v5.76.0) + message(".. KF5_GIT_TAG :" ${KF5_GIT_TAG}) +endif() + find_package(KF5CoreAddons REQUIRED) #---ToDo why you don't work :/ #FetchContent_Declare( # kcoreaddons # GIT_REPOSITORY https://invent.kde.org/frameworks/kcoreaddons.git -# GIT_TAG v5.76.0) +# GIT_TAG ${KF5_GIT_TAG}) #FetchContent_MakeAvailable(kcoreaddons) #___ToDo FetchContent_Declare( kwidgetsaddons GIT_REPOSITORY https://invent.kde.org/frameworks/kwidgetsaddons.git - GIT_TAG v5.76.0) + GIT_TAG ${KF5_GIT_TAG}) FetchContent_MakeAvailable(kwidgetsaddons) @@ -104,13 +113,13 @@ target_link_libraries( PRIVATE KF5::WidgetsAddons KF5::CoreAddons - Qt5::Gui - Qt5::Xml - Qt5::Svg - Qt5::Sql - Qt5::Network - Qt5::Widgets - Qt5::Concurrent) + Qt::Gui + Qt::Xml + Qt::Svg + Qt::Sql + Qt::Network + Qt::Widgets + Qt::Concurrent) if (DEFINED ENV{CATCH_INCLUDE_DIR}) set(CATCH_INCLUDE_DIR $ENV{CATCH_INCLUDE_DIR}) @@ -118,7 +127,7 @@ else () set(CATCH_INCLUDE_DIR "") # set by Qt Creator wizard endif () if (CATCH_INCLUDE_DIR STREQUAL "") - message("CATCH_INCLUDE_DIR is not set," + message(".. CATCH_INCLUDE_DIR is not set," "assuming Catch2 can be found automatically in your system") elseif (EXISTS ${CATCH_INCLUDE_DIR}) include_directories(${CATCH_INCLUDE_DIR}) diff --git a/tests/googlemock/CMakeLists.txt b/tests/googlemock/CMakeLists.txt index 32515c478..12fe40f82 100644 --- a/tests/googlemock/CMakeLists.txt +++ b/tests/googlemock/CMakeLists.txt @@ -16,7 +16,7 @@ cmake_minimum_required(VERSION 3.5) -message("_____________________________________________________________________") +message("..___________________________________________________________________") project(G_unitmocktests LANGUAGES CXX) @@ -29,8 +29,14 @@ set(CMAKE_AUTOUIC ON) SET(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -if(DEFINED ENV{QET_DIR}) +message(".. PROJECT_NAME :" ${PROJECT_NAME}) +message(".. PROJECT_SOURCE_DIR :" ${PROJECT_SOURCE_DIR}) +if(NOT DEFINED QET_DIR) set(QET_DIR "../..") + message(".. QET_DIR is not set, assuming QET is ../..") +endif() +message(".. QET_DIR :" ${QET_DIR}) +if(NOT DEFINED QET_COMPONENTS) set(QET_COMPONENTS Widgets Concurrent @@ -40,22 +46,20 @@ if(DEFINED ENV{QET_DIR}) Sql PrintSupport LinguistTools) - message("QET_DIR is not set, assuming QET is ../..") + message(".. QET_COMPONENTS is not set !!! I set them up !!!") endif() - -message("PROJECT_NAME: " ${PROJECT_NAME}) -message("PROJECT_SOURCE_DIR: " ${PROJECT_SOURCE_DIR}) -message("QET_DIR: " ${QET_DIR}) - -find_package( - QT - NAMES - Qt6 - Qt5 - COMPONENTS - ${QET_COMPONENTS} - REQUIRED - ) +if(NOT DEFINED QT_VERSION_MAJOR) + find_package( + QT + NAMES + Qt6 + Qt5 + COMPONENTS + ${QET_COMPONENTS} + REQUIRED + ) +endif() +message(".. QT_VERSION_MAJOR :" ${QT_VERSION_MAJOR}) find_package( Qt${QT_VERSION_MAJOR} @@ -72,26 +76,32 @@ FetchContent_Declare( FetchContent_MakeAvailable(GTest) +if(NOT DEFINED KF5_GIT_TAG) + set(KF5_GIT_TAG v5.76.0) + message(".. KF5_GIT_TAG :" ${KF5_GIT_TAG}) +endif() + find_package(KF5CoreAddons REQUIRED) #---ToDo why you don't work :/ #FetchContent_Declare( # kcoreaddons # GIT_REPOSITORY https://invent.kde.org/frameworks/kcoreaddons.git -# GIT_TAG v5.76.0) +# GIT_TAG ${KF5_GIT_TAG}) #FetchContent_MakeAvailable(kcoreaddons) #___ToDo FetchContent_Declare( kwidgetsaddons GIT_REPOSITORY https://invent.kde.org/frameworks/kwidgetsaddons.git - GIT_TAG v5.76.0) + GIT_TAG ${KF5_GIT_TAG}) FetchContent_MakeAvailable(kwidgetsaddons) add_executable( ${PROJECT_NAME} tst_My_test.cpp - main.cpp) + main.cpp + ) target_link_libraries( ${PROJECT_NAME} @@ -100,11 +110,11 @@ target_link_libraries( PRIVATE KF5::WidgetsAddons KF5::CoreAddons - Qt5::Gui - Qt5::Xml - Qt5::Svg - Qt5::Sql - Qt5::Network - Qt5::Widgets - Qt5::Concurrent) + Qt::Gui + Qt::Xml + Qt::Svg + Qt::Sql + Qt::Network + Qt::Widgets + Qt::Concurrent) diff --git a/tests/googletest/CMakeLists.txt b/tests/googletest/CMakeLists.txt index f044777a2..5c1afdd8e 100644 --- a/tests/googletest/CMakeLists.txt +++ b/tests/googletest/CMakeLists.txt @@ -16,7 +16,7 @@ cmake_minimum_required(VERSION 3.5) -message("_____________________________________________________________________") +message("..___________________________________________________________________") project(G_unittests LANGUAGES CXX) @@ -29,8 +29,14 @@ set(CMAKE_AUTOUIC ON) SET(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -if(DEFINED ENV{QET_DIR}) +message(".. PROJECT_NAME :" ${PROJECT_NAME}) +message(".. PROJECT_SOURCE_DIR :" ${PROJECT_SOURCE_DIR}) +if(NOT DEFINED QET_DIR) set(QET_DIR "../..") + message(".. QET_DIR is not set, assuming QET is ../..") +endif() +message(".. QET_DIR :" ${QET_DIR}) +if(NOT DEFINED QET_COMPONENTS) set(QET_COMPONENTS Widgets Concurrent @@ -40,22 +46,20 @@ if(DEFINED ENV{QET_DIR}) Sql PrintSupport LinguistTools) - message("QET_DIR is not set, assuming QET is ../..") + message(".. QET_COMPONENTS is not set !!! I set them up !!!") endif() - -message("PROJECT_NAME: " ${PROJECT_NAME}) -message("PROJECT_SOURCE_DIR: " ${PROJECT_SOURCE_DIR}) -message("QET_DIR: " ${QET_DIR}) - -find_package( - QT - NAMES - Qt6 - Qt5 - COMPONENTS - ${QET_COMPONENTS} - REQUIRED - ) +if(NOT DEFINED QT_VERSION_MAJOR) + find_package( + QT + NAMES + Qt6 + Qt5 + COMPONENTS + ${QET_COMPONENTS} + REQUIRED + ) +endif() +message(".. QT_VERSION_MAJOR :" ${QT_VERSION_MAJOR}) find_package( Qt${QT_VERSION_MAJOR} @@ -72,19 +76,24 @@ FetchContent_Declare( FetchContent_MakeAvailable(GTest) +if(NOT DEFINED KF5_GIT_TAG) + set(KF5_GIT_TAG v5.76.0) + message(".. KF5_GIT_TAG :" ${KF5_GIT_TAG}) +endif() + find_package(KF5CoreAddons REQUIRED) #---ToDo why you don't work :/ #FetchContent_Declare( # kcoreaddons # GIT_REPOSITORY https://invent.kde.org/frameworks/kcoreaddons.git -# GIT_TAG v5.76.0) +# GIT_TAG ${KF5_GIT_TAG}) #FetchContent_MakeAvailable(kcoreaddons) #___ToDo FetchContent_Declare( kwidgetsaddons GIT_REPOSITORY https://invent.kde.org/frameworks/kwidgetsaddons.git - GIT_TAG v5.76.0) + GIT_TAG ${KF5_GIT_TAG}) FetchContent_MakeAvailable(kwidgetsaddons) @@ -101,11 +110,11 @@ target_link_libraries( PRIVATE KF5::WidgetsAddons KF5::CoreAddons - Qt5::Gui - Qt5::Xml - Qt5::Svg - Qt5::Sql - Qt5::Network - Qt5::Widgets - Qt5::Concurrent) + Qt::Gui + Qt::Xml + Qt::Svg + Qt::Sql + Qt::Network + Qt::Widgets + Qt::Concurrent) diff --git a/tests/qttest/CMakeLists.txt b/tests/qttest/CMakeLists.txt index 6aed857ba..ea2fdbcd9 100644 --- a/tests/qttest/CMakeLists.txt +++ b/tests/qttest/CMakeLists.txt @@ -16,7 +16,7 @@ cmake_minimum_required(VERSION 3.5) -message("_____________________________________________________________________") +message("..___________________________________________________________________") project(qt_unittests LANGUAGES CXX) @@ -29,8 +29,14 @@ set(CMAKE_AUTOUIC ON) SET(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -if(DEFINED ENV{QET_DIR}) +message(".. PROJECT_NAME :" ${PROJECT_NAME}) +message(".. PROJECT_SOURCE_DIR :" ${PROJECT_SOURCE_DIR}) +if(NOT DEFINED QET_DIR) set(QET_DIR "../..") + message(".. QET_DIR is not set, assuming QET is ../..") +endif() +message(".. QET_DIR :" ${QET_DIR}) +if(NOT DEFINED QET_COMPONENTS) set(QET_COMPONENTS Widgets Concurrent @@ -40,46 +46,54 @@ if(DEFINED ENV{QET_DIR}) Sql PrintSupport LinguistTools) - message("QET_DIR is not set, assuming QET is ../..") + message(".. QET_COMPONENTS is not set !!! I set them up !!!") endif() - -message("PROJECT_NAME: " ${PROJECT_NAME}) -message("PROJECT_SOURCE_DIR: " ${PROJECT_SOURCE_DIR}) -message("QET_DIR: " ${QET_DIR}) - -find_package(Qt5Test REQUIRED) -find_package( - QT - NAMES - Qt6 - Qt5 - COMPONENTS - ${QET_COMPONENTS} - REQUIRED - ) +if(NOT DEFINED QT_VERSION_MAJOR) + find_package( + QT + NAMES + Qt6 + Qt5 + COMPONENTS + ${QET_COMPONENTS} + Test + REQUIRED + ) +endif() +message(".. QT_VERSION_MAJOR :" ${QT_VERSION_MAJOR}) find_package( Qt${QT_VERSION_MAJOR} COMPONENTS ${QET_COMPONENTS} + Test REQUIRED) Include(FetchContent) +if(NOT DEFINED KF5_GIT_TAG) + set(KF5_GIT_TAG v5.76.0) + message(".. KF5_GIT_TAG :" ${KF5_GIT_TAG}) +endif() + find_package(KF5CoreAddons REQUIRED) #---ToDo why you don't work :/ +message(".. FetchContent_Declare kcoreaddons") #FetchContent_Declare( # kcoreaddons # GIT_REPOSITORY https://invent.kde.org/frameworks/kcoreaddons.git -# GIT_TAG v5.76.0) +# GIT_TAG ${KF5_GIT_TAG}) +#message(".. FetchContent_MakeAvailable kcoreaddons") +#FetchContent_MakeAvailable(kcoreaddons) #___ToDo +message(".. FetchContent_Declare kwidgetsaddons") FetchContent_Declare( kwidgetsaddons GIT_REPOSITORY https://invent.kde.org/frameworks/kwidgetsaddons.git - GIT_TAG v5.76.0) + GIT_TAG ${KF5_GIT_TAG}) -#FetchContent_MakeAvailable(kcoreaddons) +message(".. FetchContent_MakeAvailable kwidgetsaddons") FetchContent_MakeAvailable(kwidgetsaddons) enable_testing() @@ -90,14 +104,14 @@ add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME}) target_link_libraries( ${PROJECT_NAME} PRIVATE - Qt5::Test + Qt::Test KF5::CoreAddons KF5::WidgetsAddons - Qt5::Gui - Qt5::Xml - Qt5::Svg - Qt5::Sql - Qt5::Network - Qt5::Widgets - Qt5::Concurrent) + Qt::Gui + Qt::Xml + Qt::Svg + Qt::Sql + Qt::Network + Qt::Widgets + Qt::Concurrent)