Skip to content

Commit 17cf2a4

Browse files
committed
Remove don't use qt compones
1 parent fb57149 commit 17cf2a4

File tree

4 files changed

+22
-50
lines changed

4 files changed

+22
-50
lines changed

qtservice/CMakeLists.txt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,18 @@ set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "verbose")
1313
SET(CMAKE_AUTOUIC ON)
1414
SET(CMAKE_AUTOMOC ON)
1515
SET(CMAKE_AUTORCC ON)
16-
SET(CMAKE_VERBOSE_MAKEFILE ON)
1716

1817
#需要的QT组件
1918
if(CMAKE_VERSION VERSION_LESS "3.7.0")
2019
set(CMAKE_INCLUDE_CURRENT_DIR ON)
2120
endif()
22-
SET(QT_COMPONENTS Widgets)
21+
SET(QT_COMPONENTS Core)
2322
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core)
2423
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS ${QT_COMPONENTS})
2524
message("QT_VERSION:${Qt${QT_VERSION_MAJOR}_VERSION}")
26-
if(Qt${QT_VERSION_MAJOR}_VERSION VERSION_LESS 5.10.0 AND ANDROID)
27-
message(FATAL_ERROR "Qt must great 5.10.0")
28-
endif()
2925
if(Qt${QT_VERSION_MAJOR}_FOUND)
3026
FOREACH(_COMPONENT ${QT_COMPONENTS})
31-
SET(QT_LIBRARIES ${QT_LIBRARIES} Qt${QT_VERSION_MAJOR}::${_COMPONENT})
27+
list(APPEND QT_LIBRARIES Qt${QT_VERSION_MAJOR}::${_COMPONENT})
3228
ENDFOREACH()
3329
endif()
3430
get_filename_component(QT_INSTALL_DIR "${Qt${QT_VERSION_MAJOR}_DIR}/../../.." ABSOLUTE)
@@ -133,7 +129,7 @@ endif()
133129

134130
add_subdirectory(src)
135131

136-
option(BUILD_EXAMPLES "Build examples" ON)
132+
option(BUILD_EXAMPLES "Build examples" OFF)
137133
if(BUILD_EXAMPLES)
138134
add_subdirectory(examples)
139135
endif(BUILD_EXAMPLES)

qtservice/examples/interactive/CMakeLists.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ project(interactive)
66
if(CMAKE_VERSION VERSION_LESS "3.7.0")
77
set(CMAKE_INCLUDE_CURRENT_DIR ON)
88
endif()
9-
SET(QT_COMPONENTS Core Gui Widgets)
9+
SET(QT_LIBRARIES)
10+
SET(QT_COMPONENTS Gui Widgets)
1011
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core)
1112
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS ${QT_COMPONENTS})
1213
message("QT_VERSION:${Qt${QT_VERSION_MAJOR}_VERSION}")
@@ -15,12 +16,12 @@ if(Qt${QT_VERSION_MAJOR}_VERSION VERSION_LESS 5.10.0 AND ANDROID)
1516
endif()
1617
if(Qt${QT_VERSION_MAJOR}_FOUND)
1718
FOREACH(_COMPONENT ${QT_COMPONENTS})
18-
SET(QT_LIBRARIES ${QT_LIBRARIES} Qt${QT_VERSION_MAJOR}::${_COMPONENT})
19+
LIST(APPEND QT_LIBRARIES Qt${QT_VERSION_MAJOR}::${_COMPONENT})
1920
ENDFOREACH()
2021
endif()
2122
get_filename_component(QT_INSTALL_DIR "${Qt${QT_VERSION_MAJOR}_DIR}/../../.." ABSOLUTE)
22-
message("QT_INSTALL_DIR:${QT_INSTALL_DIR}")
23-
message("QT_LIBRARIES:${QT_LIBRARIES}")
23+
message("${PROJECT_NAME} QT_INSTALL_DIR:${QT_INSTALL_DIR}")
24+
message("${PROJECT_NAME} QT_LIBRARIES:${QT_LIBRARIES}")
2425

2526
add_executable(${PROJECT_NAME} main.cpp)
2627
target_link_libraries(${PROJECT_NAME} PRIVATE QtService ${QT_LIBRARIES})

qtservice/examples/server/CMakeLists.txt

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,6 @@ if(CMAKE_VERSION VERSION_LESS "3.7.0")
77
set(CMAKE_INCLUDE_CURRENT_DIR ON)
88
endif()
99

10-
list(APPEND QT_COMPONENTS Core Network)
11-
if(ANDROID)
12-
SET(QT_COMPONENTS ${QT_COMPONENTS} AndroidExtras)
13-
endif()
14-
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core)
15-
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS ${QT_COMPONENTS})
16-
message("QT_VERSION:${Qt${QT_VERSION_MAJOR}_VERSION}")
17-
if(Qt${QT_VERSION_MAJOR}_VERSION VERSION_LESS 5.10.0 AND ANDROID)
18-
message(FATAL_ERROR "Qt must great 5.10.0")
19-
endif()
20-
if(Qt${QT_VERSION_MAJOR}_FOUND)
21-
FOREACH(_COMPONENT ${QT_COMPONENTS})
22-
SET(QT_LIBRARIES ${QT_LIBRARIES} Qt${QT_VERSION_MAJOR}::${_COMPONENT})
23-
ENDFOREACH()
24-
endif()
25-
get_filename_component(QT_INSTALL_DIR "${Qt${QT_VERSION_MAJOR}_DIR}/../../.." ABSOLUTE)
26-
message("QT_INSTALL_DIR:${QT_INSTALL_DIR}")
27-
message("QT_LIBRARIES:${QT_LIBRARIES}")
28-
2910
add_executable(${PROJECT_NAME} main.cpp)
3011

31-
target_link_libraries(${PROJECT_NAME} PRIVATE QtService ${QT_LIBRARIES})
12+
target_link_libraries(${PROJECT_NAME} PRIVATE QtService)

qtservice/src/CMakeLists.txt

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,33 @@
22

33
cmake_minimum_required(VERSION 3.5)
44

5-
project(QtService)
6-
7-
#需要的QT组件
85
if(CMAKE_VERSION VERSION_LESS "3.7.0")
96
set(CMAKE_INCLUDE_CURRENT_DIR ON)
107
endif()
11-
SET(QT_COMPONENTS Core)
8+
9+
project(QtService)
10+
11+
# Open qt complie tools
12+
SET(CMAKE_AUTOUIC ON)
13+
SET(CMAKE_AUTOMOC ON)
14+
SET(CMAKE_AUTORCC ON)
15+
SET(CMAKE_VERBOSE_MAKEFILE ON)
16+
17+
# Need qt components
1218
if(UNIX)
1319
list(APPEND QT_COMPONENTS Network)
1420
endif()
15-
if(ANDROID)
16-
SET(QT_COMPONENTS ${QT_COMPONENTS} AndroidExtras)
17-
endif()
1821
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core)
1922
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS ${QT_COMPONENTS})
2023
message("QT_VERSION:${Qt${QT_VERSION_MAJOR}_VERSION}")
21-
if(Qt${QT_VERSION_MAJOR}_VERSION VERSION_LESS 5.10.0 AND ANDROID)
22-
message(FATAL_ERROR "Qt must great 5.10.0")
23-
endif()
2424
if(Qt${QT_VERSION_MAJOR}_FOUND)
2525
FOREACH(_COMPONENT ${QT_COMPONENTS})
26-
SET(QT_LIBRARIES ${QT_LIBRARIES} Qt${QT_VERSION_MAJOR}::${_COMPONENT})
26+
LIST(APPEND QT_LIBRARIES Qt${QT_VERSION_MAJOR}::${_COMPONENT})
2727
ENDFOREACH()
2828
endif()
2929
get_filename_component(QT_INSTALL_DIR "${Qt${QT_VERSION_MAJOR}_DIR}/../../.." ABSOLUTE)
30-
message("QT_INSTALL_DIR:${QT_INSTALL_DIR}")
31-
message("QT_LIBRARIES:${QT_LIBRARIES}")
32-
33-
#打开 qt 编译工具
34-
SET(CMAKE_AUTOUIC ON)
35-
SET(CMAKE_AUTOMOC ON)
36-
SET(CMAKE_AUTORCC ON)
37-
SET(CMAKE_VERBOSE_MAKEFILE ON)
30+
message("${PROJECT_NAME} QT_INSTALL_DIR:${QT_INSTALL_DIR}")
31+
message("${PROJECT_NAME} QT_LIBRARIES:${QT_LIBRARIES}")
3832

3933
set(SOURCE_FILES
4034
qtservice.cpp

0 commit comments

Comments
 (0)