Mod Cmake en preprocessor

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)