Skip to content

Commit 9dedab1

Browse files
gammasoft71gammasoft71
committed
Review cmake files
1 parent d3ad205 commit 9dedab1

File tree

85 files changed

+682
-666
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+682
-666
lines changed

‎CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
cmake_minimum_required(VERSION 3.20)
22

3-
# Solution
43
project(Qt.Examples)
54

6-
# Options
75
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
86

9-
# Projects
107
add_subdirectory(Qt.Core)
118
add_subdirectory(Qt.Widgets)
129
#add_subdirectory(Qt.Quick)

‎Qt.Core/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
cmake_minimum_required(VERSION 3.20)
22

3-
# Solution
43
project(Qt.Core)
54

6-
# Projects
75
add_subdirectory(HelloWorlds)
86
add_subdirectory(Collections)
97
add_subdirectory(Console)

‎Qt.Core/Collections/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
cmake_minimum_required(VERSION 3.20)
22

3-
# Solution
43
project(Collections)
54

6-
# Projects
75
add_subdirectory(List)

‎Qt.Core/Collections/List/CMakeLists.txt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
cmake_minimum_required(VERSION 3.20)
22

33
project(List)
4-
find_package(Qt6Core CONFIG REQUIRED)
5-
if (NOT Qt6_FOUND)
6-
find_package(Qt5Core CONFIG REQUIRED)
7-
endif()
4+
85
set(CMAKE_CXX_STANDARD 17)
96
set(CMAKE_CXX_STANDARD_REQUIRED ON)
7+
8+
find_package(Qt6 REQUIRED COMPONENTS Core)
9+
if (Qt6_FOUND)
10+
qt_standard_project_setup()
11+
else ()
12+
find_package(Qt5 REQUIRED COMPONENTS Core)
13+
endif ()
14+
1015
add_executable(${PROJECT_NAME} src/List.cpp)
1116
target_link_libraries(${PROJECT_NAME} Qt::Core)
1217
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Core/Collections")

‎Qt.Core/Console/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
cmake_minimum_required(VERSION 3.20)
22

3-
# Solution
43
project(Console)
54

6-
# Projects
75
add_subdirectory(Console)
86
add_subdirectory(ConsoleColor)

‎Qt.Core/Console/Console/CMakeLists.txt

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
cmake_minimum_required(VERSION 3.20)
22

33
project(Console)
4-
find_package(Qt6Widgets CONFIG REQUIRED)
5-
if (NOT Qt6_FOUND)
6-
find_package(Qt5Widgets CONFIG REQUIRED)
7-
endif()
4+
85
set(CMAKE_CXX_STANDARD 17)
96
set(CMAKE_CXX_STANDARD_REQUIRED ON)
7+
8+
find_package(Qt6 REQUIRED COMPONENTS Core Widgets)
9+
if (Qt6_FOUND)
10+
qt_standard_project_setup()
11+
else ()
12+
find_package(Qt5 REQUIRED COMPONENTS Core Widgets)
13+
set(CMAKE_AUTOMOC ON)
14+
set(CMAKE_AUTORCC ON)
15+
set(CMAKE_AUTOUIC ON)
16+
endif ()
17+
1018
add_executable(${PROJECT_NAME} src/Console.cpp)
1119
target_link_libraries(${PROJECT_NAME} Qt::Core)
1220
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Core/Console")

‎Qt.Core/Console/ConsoleColor/CMakeLists.txt

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
cmake_minimum_required(VERSION 3.20)
22

3-
# Project
43
project(ConsoleColor)
5-
find_package(Qt6Core CONFIG REQUIRED)
6-
if (NOT Qt6_FOUND)
7-
find_package(Qt5Core CONFIG REQUIRED)
8-
endif()
94

10-
# Options
115
set(CMAKE_CXX_STANDARD 17)
126
set(CMAKE_CXX_STANDARD_REQUIRED ON)
137

14-
# Application
8+
find_package(Qt6 REQUIRED COMPONENTS Core)
9+
if (Qt6_FOUND)
10+
qt_standard_project_setup()
11+
else ()
12+
find_package(Qt5 REQUIRED COMPONENTS Core)
13+
set(CMAKE_AUTOMOC ON)
14+
set(CMAKE_AUTORCC ON)
15+
set(CMAKE_AUTOUIC ON)
16+
endif ()
17+
1518
add_executable(ConsoleColor src/ConsoleColor.cpp)
1619
target_link_libraries(ConsoleColor Qt::Core)
1720
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Core/Console")

‎Qt.Core/HelloWorlds/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
cmake_minimum_required(VERSION 3.20)
22

3-
# Solution
43
project(HelloWorlds)
54

6-
# Projects
75
add_subdirectory(HelloWorldConsole)

‎Qt.Core/HelloWorlds/HelloWorldConsole/CMakeLists.txt

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
cmake_minimum_required(VERSION 3.20)
22

33
project(HelloWorldConsole)
4-
find_package(Qt6Core CONFIG REQUIRED)
5-
if (NOT Qt6_FOUND)
6-
find_package(Qt5Core CONFIG REQUIRED)
7-
endif()
4+
85
set(CMAKE_CXX_STANDARD 17)
96
set(CMAKE_CXX_STANDARD_REQUIRED ON)
7+
8+
find_package(Qt6 REQUIRED COMPONENTS Core)
9+
if (Qt6_FOUND)
10+
qt_standard_project_setup()
11+
else ()
12+
find_package(Qt5 REQUIRED COMPONENTS Core)
13+
set(CMAKE_AUTOMOC ON)
14+
set(CMAKE_AUTORCC ON)
15+
set(CMAKE_AUTOUIC ON)
16+
endif ()
17+
1018
add_executable(${PROJECT_NAME} src/HelloWorldConsole.cpp)
1119
target_link_libraries(${PROJECT_NAME} Qt::Core)
1220
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Core/HelloWorlds")

‎Qt.Core/Strings/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
cmake_minimum_required(VERSION 3.20)
22

3-
# Solution
43
project(Strings)
54

6-
# Projects
75
add_subdirectory(StringSplit)
86
add_subdirectory(StringUnicode)
97
add_subdirectory(StringUnicode2)

‎Qt.Core/Strings/StringSplit/CMakeLists.txt

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
cmake_minimum_required(VERSION 3.20)
22

33
project(StringSplit)
4-
find_package(Qt6Core CONFIG REQUIRED)
5-
if (NOT Qt6_FOUND)
6-
find_package(Qt5Core CONFIG REQUIRED)
7-
endif()
4+
85
set(CMAKE_CXX_STANDARD 17)
96
set(CMAKE_CXX_STANDARD_REQUIRED ON)
7+
8+
find_package(Qt6 REQUIRED COMPONENTS Core)
9+
if (Qt6_FOUND)
10+
qt_standard_project_setup()
11+
else ()
12+
find_package(Qt5 REQUIRED COMPONENTS Core)
13+
set(CMAKE_AUTOMOC ON)
14+
set(CMAKE_AUTORCC ON)
15+
set(CMAKE_AUTOUIC ON)
16+
endif ()
17+
1018
add_executable(${PROJECT_NAME} src/StringSplit.cpp)
1119
target_link_libraries(${PROJECT_NAME} Qt::Core)
1220
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Core/Strings")

‎Qt.Core/Strings/StringUnicode/CMakeLists.txt

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
cmake_minimum_required(VERSION 3.20)
22

33
project(StringUnicode)
4-
find_package(Qt6Core CONFIG REQUIRED)
5-
if (NOT Qt6_FOUND)
6-
find_package(Qt5Core CONFIG REQUIRED)
7-
endif()
4+
85
set(CMAKE_CXX_STANDARD 17)
96
set(CMAKE_CXX_STANDARD_REQUIRED ON)
7+
8+
find_package(Qt6 REQUIRED COMPONENTS Core)
9+
if (Qt6_FOUND)
10+
qt_standard_project_setup()
11+
else ()
12+
find_package(Qt5 REQUIRED COMPONENTS Core)
13+
set(CMAKE_AUTOMOC ON)
14+
set(CMAKE_AUTORCC ON)
15+
set(CMAKE_AUTOUIC ON)
16+
endif ()
17+
1018
add_executable(${PROJECT_NAME} src/StringUnicode.cpp)
1119
target_link_libraries(${PROJECT_NAME} Qt::Core)
1220
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Core/Strings")

‎Qt.Core/Strings/StringUnicode2/CMakeLists.txt

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
cmake_minimum_required(VERSION 3.20)
22

33
project(StringUnicode2)
4-
find_package(Qt6Core CONFIG REQUIRED)
5-
if (NOT Qt6_FOUND)
6-
find_package(Qt5Core CONFIG REQUIRED)
7-
endif()
4+
85
set(CMAKE_CXX_STANDARD 17)
96
set(CMAKE_CXX_STANDARD_REQUIRED ON)
7+
8+
find_package(Qt6 REQUIRED COMPONENTS Core)
9+
if (Qt6_FOUND)
10+
qt_standard_project_setup()
11+
else ()
12+
find_package(Qt5 REQUIRED COMPONENTS Core)
13+
set(CMAKE_AUTOMOC ON)
14+
set(CMAKE_AUTORCC ON)
15+
set(CMAKE_AUTOUIC ON)
16+
endif ()
17+
1018
add_executable(${PROJECT_NAME} src/StringUnicode2.cpp)
1119
target_link_libraries(${PROJECT_NAME} Qt::Core)
1220
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Core/Strings")

‎Qt.Core/Tests/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
cmake_minimum_required(VERSION 3.20)
22

3-
# Solution
43
project(Tests)
54

6-
# Projects
75
add_subdirectory(TestConsole)

‎Qt.Core/Tests/TestConsole/CMakeLists.txt

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
cmake_minimum_required(VERSION 3.20)
22

3-
# Project
43
project(TestConsole)
5-
find_package(Qt6Core CONFIG REQUIRED)
6-
if (NOT Qt6_FOUND)
7-
find_package(Qt5Core CONFIG REQUIRED)
8-
endif()
94

10-
# Options
115
set(CMAKE_CXX_STANDARD 17)
126
set(CMAKE_CXX_STANDARD_REQUIRED ON)
137

14-
# Application
8+
find_package(Qt6 REQUIRED COMPONENTS Core)
9+
if (Qt6_FOUND)
10+
qt_standard_project_setup()
11+
else ()
12+
find_package(Qt5 REQUIRED COMPONENTS Core)
13+
set(CMAKE_AUTOMOC ON)
14+
set(CMAKE_AUTORCC ON)
15+
set(CMAKE_AUTOUIC ON)
16+
endif ()
17+
1518
add_executable(TestConsole src/main.cpp)
1619
target_link_libraries(TestConsole Qt::Core)
1720
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Core/tests")

‎Qt.Test/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
cmake_minimum_required(VERSION 3.20)
22

3-
# Solution
43
project(Qt.Test)
54

6-
# Projects
75
add_subdirectory(HelloWorldsUnitTest)

‎Qt.Test/HelloWorldsUnitTest/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
cmake_minimum_required(VERSION 3.20)
22

3-
# Solution
43
project(HelloWorldsUnitTest)
54

6-
# Projects
75
add_subdirectory(HelloWorldUnitTest)

‎Qt.Test/HelloWorldsUnitTest/HelloWorldUnitTest/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ project(HelloWorldUnitTest)
55
set(CMAKE_CXX_STANDARD 17)
66
set(CMAKE_CXX_STANDARD_REQUIRED ON)
77

8-
find_package(Qt6Core CONFIG REQUIRED)
98
find_package(Qt6 REQUIRED COMPONENTS Core Test)
109
if (Qt6_FOUND)
1110
qt_standard_project_setup()

‎Qt.Widgets/Applications/Application/CMakeLists.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
cmake_minimum_required(VERSION 3.20)
22

3-
# Project
43
project(Application)
5-
find_package(Qt6Widgets CONFIG REQUIRED)
6-
if (NOT Qt6_FOUND)
7-
find_package(Qt5Widgets CONFIG REQUIRED)
8-
endif()
94

10-
# Options
11-
set(CMAKE_AUTOMOC ON)
12-
set(CMAKE_AUTORCC ON)
13-
set(CMAKE_AUTOUIC ON)
145
set(CMAKE_CXX_STANDARD 17)
156
set(CMAKE_CXX_STANDARD_REQUIRED ON)
167

17-
# Application
8+
find_package(Qt6 REQUIRED COMPONENTS Core Widgets)
9+
if (Qt6_FOUND)
10+
qt_standard_project_setup()
11+
else ()
12+
find_package(Qt5 REQUIRED COMPONENTS Core Widgets)
13+
set(CMAKE_AUTOMOC ON)
14+
set(CMAKE_AUTORCC ON)
15+
set(CMAKE_AUTOUIC ON)
16+
endif ()
17+
1818
add_executable(${PROJECT_NAME} WIN32 MACOSX_BUNDLE src/Application.cpp)
19-
target_link_libraries(${PROJECT_NAME} Qt::Widgets)
19+
target_link_libraries(${PROJECT_NAME} Qt::Core Qt::Widgets)
2020
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Widgets/Applications")

‎Qt.Widgets/Applications/Application/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# Application
21

32
Shows how to create an application with QApplication.
43

‎Qt.Widgets/Applications/ApplicationAndException/CMakeLists.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
cmake_minimum_required(VERSION 3.20)
22

3-
# Project
43
project(ApplicationAndException)
5-
find_package(Qt6Widgets CONFIG REQUIRED)
6-
if (NOT Qt6_FOUND)
7-
find_package(Qt5Widgets CONFIG REQUIRED)
8-
endif()
94

10-
# Options
11-
set(CMAKE_AUTOMOC ON)
12-
set(CMAKE_AUTORCC ON)
13-
set(CMAKE_AUTOUIC ON)
145
set(CMAKE_CXX_STANDARD 17)
156
set(CMAKE_CXX_STANDARD_REQUIRED ON)
167

17-
# Application
8+
find_package(Qt6 REQUIRED COMPONENTS Core Widgets)
9+
if (Qt6_FOUND)
10+
qt_standard_project_setup()
11+
else ()
12+
find_package(Qt5 REQUIRED COMPONENTS Core Widgets)
13+
set(CMAKE_AUTOMOC ON)
14+
set(CMAKE_AUTORCC ON)
15+
set(CMAKE_AUTOUIC ON)
16+
endif ()
17+
1818
add_executable(${PROJECT_NAME} WIN32 MACOSX_BUNDLE src/ApplicationAndException.cpp src/ApplicationAndException.h)
19-
target_link_libraries(${PROJECT_NAME} Qt::Widgets)
19+
target_link_libraries(${PROJECT_NAME} Qt::Core Qt::Widgets)
2020
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Widgets/Applications")

‎Qt.Widgets/Applications/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
cmake_minimum_required(VERSION 3.20)
22

3-
# Solution
43
project(Applications)
54

65
# Application and messages

‎Qt.Widgets/Applications/DarkMode/CMakeLists.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
cmake_minimum_required(VERSION 3.20)
22

3-
# Project
43
project(DarkMode)
5-
find_package(Qt6Widgets CONFIG REQUIRED)
6-
if (NOT Qt6_FOUND)
7-
find_package(Qt5Widgets CONFIG REQUIRED)
8-
endif()
94

10-
# Options
11-
set(CMAKE_AUTOMOC ON)
12-
set(CMAKE_AUTORCC ON)
13-
set(CMAKE_AUTOUIC ON)
145
set(CMAKE_CXX_STANDARD 17)
156
set(CMAKE_CXX_STANDARD_REQUIRED ON)
167

17-
# Application
8+
find_package(Qt6 REQUIRED COMPONENTS Core Widgets)
9+
if (Qt6_FOUND)
10+
qt_standard_project_setup()
11+
else ()
12+
find_package(Qt5 REQUIRED COMPONENTS Core Widgets)
13+
set(CMAKE_AUTOMOC ON)
14+
set(CMAKE_AUTORCC ON)
15+
set(CMAKE_AUTOUIC ON)
16+
endif ()
17+
1818
add_executable(DarkMode WIN32 MACOSX_BUNDLE src/DarkMode.cpp src/DarkMode.h)
1919
target_link_libraries(DarkMode Qt::Widgets)
2020
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "Qt.Widgets/Applications")

0 commit comments

Comments
 (0)