Review cmake files

gammasoft71 · Jan 14, 2024 · 9dedab1 · 9dedab1
1 parent d3ad205
commit 9dedab1
Show file tree

Hide file tree

Showing 85 changed files with 682 additions and 666 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,12 +1,9 @@
 cmake_minimum_required(VERSION 3.20)
 
-# Solution
 project(Qt.Examples)
 
-# Options
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
-# Projects
 add_subdirectory(Qt.Core)
 add_subdirectory(Qt.Widgets)
 #add_subdirectory(Qt.Quick)

diff --git a/Qt.Core/CMakeLists.txt b/Qt.Core/CMakeLists.txt
@@ -1,9 +1,7 @@
 cmake_minimum_required(VERSION 3.20)
 
-# Solution
 project(Qt.Core)
 
-# Projects
 add_subdirectory(HelloWorlds)
 add_subdirectory(Collections)
 add_subdirectory(Console)

diff --git a/Qt.Core/Collections/CMakeLists.txt b/Qt.Core/Collections/CMakeLists.txt
@@ -1,7 +1,5 @@
 cmake_minimum_required(VERSION 3.20)
 
-# Solution
 project(Collections)
 
-# Projects
 add_subdirectory(List)
diff --git a/Qt.Core/Collections/List/CMakeLists.txt b/Qt.Core/Collections/List/CMakeLists.txt
@@ -1,12 +1,17 @@
 cmake_minimum_required(VERSION 3.20)
 
 project(List)
-find_package(Qt6Core CONFIG REQUIRED)
-if (NOT Qt6_FOUND)
-  find_package(Qt5Core CONFIG REQUIRED)
-endif()
+
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+find_package(Qt6 REQUIRED COMPONENTS Core)
+if (Qt6_FOUND)
+  qt_standard_project_setup()
+else ()
+  find_package(Qt5 REQUIRED COMPONENTS Core)
+endif ()
+
 add_executable(${PROJECT_NAME} src/List.cpp)
 target_link_libraries(${PROJECT_NAME} Qt::Core)
 set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Core/Collections")
diff --git a/Qt.Core/Console/CMakeLists.txt b/Qt.Core/Console/CMakeLists.txt
@@ -1,8 +1,6 @@
 cmake_minimum_required(VERSION 3.20)
 
-# Solution
 project(Console)
 
-# Projects
 add_subdirectory(Console)
 add_subdirectory(ConsoleColor)
diff --git a/Qt.Core/Console/Console/CMakeLists.txt b/Qt.Core/Console/Console/CMakeLists.txt
@@ -1,12 +1,20 @@
 cmake_minimum_required(VERSION 3.20)
 
 project(Console)
-find_package(Qt6Widgets CONFIG REQUIRED)
-if (NOT Qt6_FOUND)
-  find_package(Qt5Widgets CONFIG REQUIRED)
-endif()
+
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+find_package(Qt6 REQUIRED COMPONENTS Core Widgets)
+if (Qt6_FOUND)
+  qt_standard_project_setup()
+else ()
+  find_package(Qt5 REQUIRED COMPONENTS Core Widgets)
+  set(CMAKE_AUTOMOC ON)
+  set(CMAKE_AUTORCC ON)
+  set(CMAKE_AUTOUIC ON)
+endif ()
+
 add_executable(${PROJECT_NAME} src/Console.cpp)
 target_link_libraries(${PROJECT_NAME} Qt::Core)
 set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Core/Console")
diff --git a/Qt.Core/Console/ConsoleColor/CMakeLists.txt b/Qt.Core/Console/ConsoleColor/CMakeLists.txt
@@ -1,17 +1,20 @@
 cmake_minimum_required(VERSION 3.20)
 
-# Project
 project(ConsoleColor)
-find_package(Qt6Core CONFIG REQUIRED)
-if (NOT Qt6_FOUND)
-  find_package(Qt5Core CONFIG REQUIRED)
-endif()
 
-# Options
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-# Application
+find_package(Qt6 REQUIRED COMPONENTS Core)
+if (Qt6_FOUND)
+  qt_standard_project_setup()
+else ()
+  find_package(Qt5 REQUIRED COMPONENTS Core)
+  set(CMAKE_AUTOMOC ON)
+  set(CMAKE_AUTORCC ON)
+  set(CMAKE_AUTOUIC ON)
+endif ()
+
 add_executable(ConsoleColor src/ConsoleColor.cpp)
 target_link_libraries(ConsoleColor Qt::Core)
 set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Core/Console")
diff --git a/Qt.Core/HelloWorlds/CMakeLists.txt b/Qt.Core/HelloWorlds/CMakeLists.txt
@@ -1,7 +1,5 @@
 cmake_minimum_required(VERSION 3.20)
 
-# Solution
 project(HelloWorlds)
 
-# Projects
 add_subdirectory(HelloWorldConsole)
diff --git a/Qt.Core/HelloWorlds/HelloWorldConsole/CMakeLists.txt b/Qt.Core/HelloWorlds/HelloWorldConsole/CMakeLists.txt
@@ -1,12 +1,20 @@
 cmake_minimum_required(VERSION 3.20)
 
 project(HelloWorldConsole)
-find_package(Qt6Core CONFIG REQUIRED)
-if (NOT Qt6_FOUND)
-  find_package(Qt5Core CONFIG REQUIRED)
-endif()
+
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+find_package(Qt6 REQUIRED COMPONENTS Core)
+if (Qt6_FOUND)
+  qt_standard_project_setup()
+else ()
+  find_package(Qt5 REQUIRED COMPONENTS Core)
+  set(CMAKE_AUTOMOC ON)
+  set(CMAKE_AUTORCC ON)
+  set(CMAKE_AUTOUIC ON)
+endif ()
+
 add_executable(${PROJECT_NAME} src/HelloWorldConsole.cpp)
 target_link_libraries(${PROJECT_NAME} Qt::Core)
 set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Core/HelloWorlds")
diff --git a/Qt.Core/Strings/CMakeLists.txt b/Qt.Core/Strings/CMakeLists.txt
@@ -1,9 +1,7 @@
 cmake_minimum_required(VERSION 3.20)
 
-# Solution
 project(Strings)
 
-# Projects
 add_subdirectory(StringSplit)
 add_subdirectory(StringUnicode)
 add_subdirectory(StringUnicode2)
diff --git a/Qt.Core/Strings/StringSplit/CMakeLists.txt b/Qt.Core/Strings/StringSplit/CMakeLists.txt
@@ -1,12 +1,20 @@
 cmake_minimum_required(VERSION 3.20)
 
 project(StringSplit)
-find_package(Qt6Core CONFIG REQUIRED)
-if (NOT Qt6_FOUND)
-  find_package(Qt5Core CONFIG REQUIRED)
-endif()
+
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+find_package(Qt6 REQUIRED COMPONENTS Core)
+if (Qt6_FOUND)
+  qt_standard_project_setup()
+else ()
+  find_package(Qt5 REQUIRED COMPONENTS Core)
+  set(CMAKE_AUTOMOC ON)
+  set(CMAKE_AUTORCC ON)
+  set(CMAKE_AUTOUIC ON)
+endif ()
+
 add_executable(${PROJECT_NAME} src/StringSplit.cpp)
 target_link_libraries(${PROJECT_NAME} Qt::Core)
 set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Core/Strings")
diff --git a/Qt.Core/Strings/StringUnicode/CMakeLists.txt b/Qt.Core/Strings/StringUnicode/CMakeLists.txt
@@ -1,12 +1,20 @@
 cmake_minimum_required(VERSION 3.20)
 
 project(StringUnicode)
-find_package(Qt6Core CONFIG REQUIRED)
-if (NOT Qt6_FOUND)
-  find_package(Qt5Core CONFIG REQUIRED)
-endif()
+
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+find_package(Qt6 REQUIRED COMPONENTS Core)
+if (Qt6_FOUND)
+  qt_standard_project_setup()
+else ()
+  find_package(Qt5 REQUIRED COMPONENTS Core)
+  set(CMAKE_AUTOMOC ON)
+  set(CMAKE_AUTORCC ON)
+  set(CMAKE_AUTOUIC ON)
+endif ()
+
 add_executable(${PROJECT_NAME} src/StringUnicode.cpp)
 target_link_libraries(${PROJECT_NAME} Qt::Core)
 set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Core/Strings")
diff --git a/Qt.Core/Strings/StringUnicode2/CMakeLists.txt b/Qt.Core/Strings/StringUnicode2/CMakeLists.txt
@@ -1,12 +1,20 @@
 cmake_minimum_required(VERSION 3.20)
 
 project(StringUnicode2)
-find_package(Qt6Core CONFIG REQUIRED)
-if (NOT Qt6_FOUND)
-  find_package(Qt5Core CONFIG REQUIRED)
-endif()
+
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+find_package(Qt6 REQUIRED COMPONENTS Core)
+if (Qt6_FOUND)
+  qt_standard_project_setup()
+else ()
+  find_package(Qt5 REQUIRED COMPONENTS Core)
+  set(CMAKE_AUTOMOC ON)
+  set(CMAKE_AUTORCC ON)
+  set(CMAKE_AUTOUIC ON)
+endif ()
+
 add_executable(${PROJECT_NAME} src/StringUnicode2.cpp)
 target_link_libraries(${PROJECT_NAME} Qt::Core)
 set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Core/Strings")
diff --git a/Qt.Core/Tests/CMakeLists.txt b/Qt.Core/Tests/CMakeLists.txt
@@ -1,7 +1,5 @@
 cmake_minimum_required(VERSION 3.20)
 
-# Solution
 project(Tests)
 
-# Projects
 add_subdirectory(TestConsole)
diff --git a/Qt.Core/Tests/TestConsole/CMakeLists.txt b/Qt.Core/Tests/TestConsole/CMakeLists.txt
@@ -1,17 +1,20 @@
 cmake_minimum_required(VERSION 3.20)
 
-# Project
 project(TestConsole)
-find_package(Qt6Core CONFIG REQUIRED)
-if (NOT Qt6_FOUND)
-  find_package(Qt5Core CONFIG REQUIRED)
-endif()
 
-# Options
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-# Application
+find_package(Qt6 REQUIRED COMPONENTS Core)
+if (Qt6_FOUND)
+  qt_standard_project_setup()
+else ()
+  find_package(Qt5 REQUIRED COMPONENTS Core)
+  set(CMAKE_AUTOMOC ON)
+  set(CMAKE_AUTORCC ON)
+  set(CMAKE_AUTOUIC ON)
+endif ()
+
 add_executable(TestConsole src/main.cpp)
 target_link_libraries(TestConsole Qt::Core)
 set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Core/tests")
diff --git a/Qt.Test/CMakeLists.txt b/Qt.Test/CMakeLists.txt
@@ -1,7 +1,5 @@
 cmake_minimum_required(VERSION 3.20)
 
-# Solution
 project(Qt.Test)
 
-# Projects
 add_subdirectory(HelloWorldsUnitTest)
diff --git a/Qt.Test/HelloWorldsUnitTest/CMakeLists.txt b/Qt.Test/HelloWorldsUnitTest/CMakeLists.txt
@@ -1,7 +1,5 @@
 cmake_minimum_required(VERSION 3.20)
 
-# Solution
 project(HelloWorldsUnitTest)
 
-# Projects
 add_subdirectory(HelloWorldUnitTest)
diff --git a/Qt.Test/HelloWorldsUnitTest/HelloWorldUnitTest/CMakeLists.txt b/Qt.Test/HelloWorldsUnitTest/HelloWorldUnitTest/CMakeLists.txt
@@ -5,7 +5,6 @@ project(HelloWorldUnitTest)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-find_package(Qt6Core CONFIG REQUIRED)
 find_package(Qt6 REQUIRED COMPONENTS Core Test)
 if (Qt6_FOUND)
   qt_standard_project_setup()

diff --git a/Qt.Widgets/Applications/Application/CMakeLists.txt b/Qt.Widgets/Applications/Application/CMakeLists.txt
@@ -1,20 +1,20 @@
 cmake_minimum_required(VERSION 3.20)
 
-# Project
 project(Application)
-find_package(Qt6Widgets CONFIG REQUIRED)
-if (NOT Qt6_FOUND)
-  find_package(Qt5Widgets CONFIG REQUIRED)
-endif()
 
-# Options
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-# Application
+find_package(Qt6 REQUIRED COMPONENTS Core Widgets)
+if (Qt6_FOUND)
+  qt_standard_project_setup()
+else ()
+  find_package(Qt5 REQUIRED COMPONENTS Core Widgets)
+  set(CMAKE_AUTOMOC ON)
+  set(CMAKE_AUTORCC ON)
+  set(CMAKE_AUTOUIC ON)
+endif ()
+
 add_executable(${PROJECT_NAME} WIN32 MACOSX_BUNDLE src/Application.cpp)
-target_link_libraries(${PROJECT_NAME} Qt::Widgets)
+target_link_libraries(${PROJECT_NAME} Qt::Core Qt::Widgets)
 set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Widgets/Applications")
diff --git a/Qt.Widgets/Applications/Application/README.md b/Qt.Widgets/Applications/Application/README.md
@@ -1,4 +1,3 @@
-# Application
 
 Shows how to create an application with QApplication.
 

diff --git a/Qt.Widgets/Applications/ApplicationAndException/CMakeLists.txt b/Qt.Widgets/Applications/ApplicationAndException/CMakeLists.txt
@@ -1,20 +1,20 @@
 cmake_minimum_required(VERSION 3.20)
 
-# Project
 project(ApplicationAndException)
-find_package(Qt6Widgets CONFIG REQUIRED)
-if (NOT Qt6_FOUND)
-  find_package(Qt5Widgets CONFIG REQUIRED)
-endif()
 
-# Options
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-# Application
+find_package(Qt6 REQUIRED COMPONENTS Core Widgets)
+if (Qt6_FOUND)
+  qt_standard_project_setup()
+else ()
+  find_package(Qt5 REQUIRED COMPONENTS Core Widgets)
+  set(CMAKE_AUTOMOC ON)
+  set(CMAKE_AUTORCC ON)
+  set(CMAKE_AUTOUIC ON)
+endif ()
+
 add_executable(${PROJECT_NAME} WIN32 MACOSX_BUNDLE src/ApplicationAndException.cpp src/ApplicationAndException.h)
-target_link_libraries(${PROJECT_NAME} Qt::Widgets)
+target_link_libraries(${PROJECT_NAME} Qt::Core Qt::Widgets)
 set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Widgets/Applications")
diff --git a/Qt.Widgets/Applications/CMakeLists.txt b/Qt.Widgets/Applications/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required(VERSION 3.20)
 
-# Solution
 project(Applications)
 
 # Application and messages

diff --git a/Qt.Widgets/Applications/DarkMode/CMakeLists.txt b/Qt.Widgets/Applications/DarkMode/CMakeLists.txt
@@ -1,20 +1,20 @@
 cmake_minimum_required(VERSION 3.20)
 
-# Project
 project(DarkMode)
-find_package(Qt6Widgets CONFIG REQUIRED)
-if (NOT Qt6_FOUND)
-  find_package(Qt5Widgets CONFIG REQUIRED)
-endif()
 
-# Options
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-# Application
+find_package(Qt6 REQUIRED COMPONENTS Core Widgets)
+if (Qt6_FOUND)
+  qt_standard_project_setup()
+else ()
+  find_package(Qt5 REQUIRED COMPONENTS Core Widgets)
+  set(CMAKE_AUTOMOC ON)
+  set(CMAKE_AUTORCC ON)
+  set(CMAKE_AUTOUIC ON)
+endif ()
+
 add_executable(DarkMode WIN32 MACOSX_BUNDLE src/DarkMode.cpp src/DarkMode.h)
 target_link_libraries(DarkMode Qt::Widgets)
 set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Widgets/Applications")
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@
		# Application

		Shows how to create an application with QApplication.

Expand Down