Mod Cmake en preprocessor

2026-03-17 23:59:58 +01:00 · 2020-12-09 15:28:43 +01:00
parent 4de9c1d922
commit d0c129478e
78 changed files with 589 additions and 327 deletions
--- a/tests/catch/CMakeLists.txt
+++ b/tests/catch/CMakeLists.txt
@@ -20,13 +20,26 @@ message("_____________________________________________________________________")

 project(C_unittests LANGUAGES CXX)

+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
+
 SET(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)

 if(DEFINED ENV{QET_DIR})
  set(QET_DIR "../..")
+  set(QET_COMPONENTS
+    Widgets
+    Concurrent
+    Xml
+    Svg
+    Network
+    Sql
+    PrintSupport
+    LinguistTools)
  message("QET_DIR is not set, assuming QET is ../..")
 endif()

@@ -34,16 +47,21 @@ message("PROJECT_NAME:       " ${PROJECT_NAME})
 message("PROJECT_SOURCE_DIR: " ${PROJECT_SOURCE_DIR})
 message("QET_DIR:            " ${QET_DIR})

-SET(CMAKE_CXX_STANDARD 17)
+find_package(
+  QT
+ NAMES
+  Qt6
+  Qt5
+ COMPONENTS
+  ${QET_COMPONENTS}
+ REQUIRED
+ )

-find_package(Qt5Gui REQUIRED)
-find_package(Qt5Xml REQUIRED)
-find_package(Qt5Svg REQUIRED)
-find_package(Qt5Sql REQUIRED)
-find_package(Qt5Concurrent REQUIRED)
-find_package(Qt5Widgets REQUIRED)
-find_package(KF5WidgetsAddons)
-find_package(KF5CoreAddons)
+find_package(
+  Qt${QT_VERSION_MAJOR}
+ COMPONENTS
+ ${QET_COMPONENTS}
+ REQUIRED)

 Include(FetchContent)

@@ -54,19 +72,30 @@ FetchContent_Declare(

 FetchContent_MakeAvailable(Catch2)

+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)
+#FetchContent_MakeAvailable(kcoreaddons)
+#___ToDo
+
+FetchContent_Declare(
+  kwidgetsaddons
+  GIT_REPOSITORY https://invent.kde.org/frameworks/kwidgetsaddons.git
+  GIT_TAG        v5.76.0)
+
+FetchContent_MakeAvailable(kwidgetsaddons)

 add_executable(
    ${PROJECT_NAME}
    tst_My_test.cpp
    src/borderproperties_test.cpp
-    src/qet_test.cpp
    main.cpp
    ${QET_DIR}/sources/borderproperties.cpp
    ${QET_DIR}/sources/borderproperties.h
-    ${QET_DIR}/sources/qet.cpp
-    ${QET_DIR}/sources/qet.h
-    ${QET_DIR}/sources/qeticons.cpp
-    ${QET_DIR}/sources/qeticons.h)
+    )

 target_link_libraries(
    ${PROJECT_NAME}
@@ -79,6 +108,7 @@ target_link_libraries(
    Qt5::Xml
    Qt5::Svg
    Qt5::Sql
+    Qt5::Network
    Qt5::Widgets
    Qt5::Concurrent)

--- a/tests/googlemock/CMakeLists.txt
+++ b/tests/googlemock/CMakeLists.txt
@@ -20,13 +20,26 @@ message("_____________________________________________________________________")

 project(G_unitmocktests LANGUAGES CXX)

+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
+
 SET(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)

 if(DEFINED ENV{QET_DIR})
  set(QET_DIR "../..")
+  set(QET_COMPONENTS
+    Widgets
+    Concurrent
+    Xml
+    Svg
+    Network
+    Sql
+    PrintSupport
+    LinguistTools)
  message("QET_DIR is not set, assuming QET is ../..")
 endif()

@@ -34,16 +47,21 @@ message("PROJECT_NAME:       " ${PROJECT_NAME})
 message("PROJECT_SOURCE_DIR: " ${PROJECT_SOURCE_DIR})
 message("QET_DIR:            " ${QET_DIR})

-SET(CMAKE_CXX_STANDARD 17)
+find_package(
+  QT
+ NAMES
+  Qt6
+  Qt5
+ COMPONENTS
+  ${QET_COMPONENTS}
+ REQUIRED
+ )

-find_package(Qt5Gui REQUIRED)
-find_package(Qt5Xml REQUIRED)
-find_package(Qt5Svg REQUIRED)
-find_package(Qt5Sql REQUIRED)
-find_package(Qt5Concurrent REQUIRED)
-find_package(Qt5Widgets REQUIRED)
-find_package(KF5WidgetsAddons)
-find_package(KF5CoreAddons)
+find_package(
+  Qt${QT_VERSION_MAJOR}
+ COMPONENTS
+ ${QET_COMPONENTS}
+ REQUIRED)

 Include(FetchContent)

@@ -54,6 +72,22 @@ FetchContent_Declare(

 FetchContent_MakeAvailable(GTest)

+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)
+#FetchContent_MakeAvailable(kcoreaddons)
+#___ToDo
+
+FetchContent_Declare(
+  kwidgetsaddons
+  GIT_REPOSITORY https://invent.kde.org/frameworks/kwidgetsaddons.git
+  GIT_TAG        v5.76.0)
+
+FetchContent_MakeAvailable(kwidgetsaddons)
+
 add_executable(
    ${PROJECT_NAME}
    tst_My_test.cpp
@@ -70,6 +104,7 @@ target_link_libraries(
    Qt5::Xml
    Qt5::Svg
    Qt5::Sql
+    Qt5::Network
    Qt5::Widgets
    Qt5::Concurrent)

--- a/tests/googletest/CMakeLists.txt
+++ b/tests/googletest/CMakeLists.txt
@@ -20,13 +20,26 @@ message("_____________________________________________________________________")

 project(G_unittests LANGUAGES CXX)

+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
+
 SET(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)

 if(DEFINED ENV{QET_DIR})
  set(QET_DIR "../..")
+  set(QET_COMPONENTS
+    Widgets
+    Concurrent
+    Xml
+    Svg
+    Network
+    Sql
+    PrintSupport
+    LinguistTools)
  message("QET_DIR is not set, assuming QET is ../..")
 endif()

@@ -34,16 +47,21 @@ message("PROJECT_NAME:       " ${PROJECT_NAME})
 message("PROJECT_SOURCE_DIR: " ${PROJECT_SOURCE_DIR})
 message("QET_DIR:            " ${QET_DIR})

-SET(CMAKE_CXX_STANDARD 17)
+find_package(
+  QT
+ NAMES
+  Qt6
+  Qt5
+ COMPONENTS
+  ${QET_COMPONENTS}
+ REQUIRED
+ )

-find_package(Qt5Gui REQUIRED)
-find_package(Qt5Xml REQUIRED)
-find_package(Qt5Svg REQUIRED)
-find_package(Qt5Sql REQUIRED)
-find_package(Qt5Concurrent REQUIRED)
-find_package(Qt5Widgets REQUIRED)
-find_package(KF5WidgetsAddons)
-find_package(KF5CoreAddons)
+find_package(
+  Qt${QT_VERSION_MAJOR}
+ COMPONENTS
+ ${QET_COMPONENTS}
+ REQUIRED)

 Include(FetchContent)

@@ -54,10 +72,27 @@ FetchContent_Declare(

 FetchContent_MakeAvailable(GTest)

+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)
+#FetchContent_MakeAvailable(kcoreaddons)
+#___ToDo
+
+FetchContent_Declare(
+  kwidgetsaddons
+  GIT_REPOSITORY https://invent.kde.org/frameworks/kwidgetsaddons.git
+  GIT_TAG        v5.76.0)
+
+FetchContent_MakeAvailable(kwidgetsaddons)
+
 add_executable(
    ${PROJECT_NAME}
    tst_My_test.cpp
-    main.cpp)
+    main.cpp
+    )

 target_link_libraries(
    ${PROJECT_NAME}
@@ -70,6 +105,7 @@ target_link_libraries(
    Qt5::Xml
    Qt5::Svg
    Qt5::Sql
+    Qt5::Network
    Qt5::Widgets
    Qt5::Concurrent)

--- a/tests/qttest/CMakeLists.txt
+++ b/tests/qttest/CMakeLists.txt
@@ -20,13 +20,26 @@ message("_____________________________________________________________________")

 project(qt_unittests LANGUAGES CXX)

+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
+
 SET(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)

 if(DEFINED ENV{QET_DIR})
  set(QET_DIR "../..")
+  set(QET_COMPONENTS
+    Widgets
+    Concurrent
+    Xml
+    Svg
+    Network
+    Sql
+    PrintSupport
+    LinguistTools)
  message("QET_DIR is not set, assuming QET is ../..")
 endif()

@@ -35,24 +48,40 @@ message("PROJECT_SOURCE_DIR: " ${PROJECT_SOURCE_DIR})
 message("QET_DIR:            " ${QET_DIR})

 find_package(Qt5Test REQUIRED)
-find_package(Qt5Gui REQUIRED)
-find_package(Qt5Xml REQUIRED)
-find_package(Qt5Svg REQUIRED)
-find_package(Qt5Sql REQUIRED)
-find_package(Qt5Concurrent REQUIRED)
-find_package(Qt5Widgets REQUIRED)
-find_package(KF5WidgetsAddons)
-find_package(KF5CoreAddons)
+find_package(
+  QT
+ NAMES
+  Qt6
+  Qt5
+ COMPONENTS
+  ${QET_COMPONENTS}
+ REQUIRED
+ )

-set(CMAKE_INCLUDE_CURRENT_DIR ON)
+find_package(
+  Qt${QT_VERSION_MAJOR}
+ COMPONENTS
+ ${QET_COMPONENTS}
+ REQUIRED)

-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
+Include(FetchContent)

-SET(CMAKE_CXX_STANDARD 17)
+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)
+#___ToDo
+
+FetchContent_Declare(
+  kwidgetsaddons
+  GIT_REPOSITORY https://invent.kde.org/frameworks/kwidgetsaddons.git
+  GIT_TAG        v5.76.0)
+
+#FetchContent_MakeAvailable(kcoreaddons)
+FetchContent_MakeAvailable(kwidgetsaddons)

-set(CMAKE_CXX_STANDARD_REQUIRED ON)
 enable_testing()

 add_executable(${PROJECT_NAME} tst_mytest.cpp)
@@ -62,13 +91,13 @@ target_link_libraries(
  ${PROJECT_NAME}
  PRIVATE
  Qt5::Test
-  KF5::WidgetsAddons
  KF5::CoreAddons
+  KF5::WidgetsAddons
  Qt5::Gui
  Qt5::Xml
  Qt5::Svg
  Qt5::Sql
+  Qt5::Network
  Qt5::Widgets
-  Qt5::Concurrent
-  )
+  Qt5::Concurrent)