Skip to content

Commit e9da73c

Browse files
jcfrjamesobutler
authored andcommitted
cmake: Update PythonQtGenerator to support only Qt5
1 parent 8e21bd2 commit e9da73c

File tree

1 file changed

+26
-20
lines changed

1 file changed

+26
-20
lines changed

generator/CMakeLists.txt

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,38 @@
1-
cmake_minimum_required(VERSION 2.8)
1+
cmake_minimum_required(VERSION 3.5)
22

33
#-----------------------------------------------------------------------------
44
project(PythonQtGenerator)
55
#-----------------------------------------------------------------------------
66

77
include(CTestUseLaunchers OPTIONAL)
88

9-
#-----------------------------------------------------------------------------
10-
# Setup Qt
9+
#----------------------------------------------------------------------------
10+
# Qt version
1111

12-
set(minimum_required_qt_version "4.6.2")
12+
# Set PythonQt_QT_VERSION
13+
set(PythonQt_QT_VERSION 5)
1314

14-
find_package(Qt4)
15+
# Requirements
16+
set(minimum_required_qt5_version "5.15.2")
17+
set(minimum_required_qt_version ${minimum_required_qt${PythonQt_QT_VERSION}_version})
1518

16-
if(QT4_FOUND)
19+
find_package(Qt5 ${minimum_required_qt_version} QUIET)
1720

18-
set(found_qt_version ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH})
21+
#-----------------------------------------------------------------------------
22+
# Setup Qt
1923

20-
if(${found_qt_version} VERSION_LESS ${minimum_required_qt_version})
21-
message(FATAL_ERROR "error: PythonQt requires Qt >= ${minimum_required_qt_version} -- you cannot use Qt ${found_qt_version}.")
22-
endif()
23-
24-
set(QT_USE_QTXML ON)
25-
26-
include(${QT_USE_FILE})
27-
else()
28-
message(FATAL_ERROR "error: Qt4 was not found on your system. You probably need to set the QT_QMAKE_EXECUTABLE variable")
29-
endif()
24+
# Required components
25+
set(qt_required_components Core Xml Widgets)
26+
27+
message(STATUS "${PROJECT_NAME}: Required Qt components [${qt_required_components}]")
28+
find_package(Qt5 ${minimum_required_qt_version} COMPONENTS ${qt_required_components} REQUIRED)
29+
30+
set(QT_LIBRARIES )
31+
foreach(qtlib ${qt_required_components})
32+
include_directories(${Qt5${qtlib}_INCLUDE_DIRS})
33+
add_definitions(${Qt5${qtlib}_DEFINITIONS})
34+
list(APPEND QT_LIBRARIES ${Qt5${qtlib}_LIBRARIES})
35+
endforeach()
3036

3137
#-----------------------------------------------------------------------------
3238
# Sources
@@ -108,9 +114,9 @@ set(qrc_sources
108114

109115
#-----------------------------------------------------------------------------
110116
# Do wrapping
111-
qt4_wrap_cpp(gen_moc_sources ${moc_sources})
112-
qt4_wrap_ui(gen_ui_sources ${ui_sources})
113-
qt4_add_resources(gen_qrc_sources ${qrc_sources})
117+
qt5_wrap_cpp(gen_moc_sources ${moc_sources})
118+
qt5_wrap_ui(gen_ui_sources ${ui_sources})
119+
qt5_add_resources(gen_qrc_sources ${qrc_sources})
114120

115121
#-----------------------------------------------------------------------------
116122
# Copy file expected by the generator and specify install rules

0 commit comments

Comments
 (0)