Skip to content

Commit aee01b2

Browse files
jcfrjamesobutler
authored andcommitted
cmake: Simplify Qt5 integration leveraging Qt5 imported targets
This simplifies Qt5 integration by using Qt5 imported targets instead of manually including directories and definitions.
1 parent 6f42d87 commit aee01b2

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

CMakeLists.txt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,8 @@ message(STATUS "${PROJECT_NAME}: Required Qt components [${qt_required_component
140140
find_package(Qt5 ${minimum_required_qt_version} COMPONENTS ${qt_required_components} REQUIRED)
141141

142142
set(QT_LIBRARIES )
143-
foreach(qtlib ${qt_required_components})
144-
include_directories(${Qt5${qtlib}_INCLUDE_DIRS})
145-
add_definitions(${Qt5${qtlib}_DEFINITIONS})
146-
list(APPEND QT_LIBRARIES ${Qt5${qtlib}_LIBRARIES})
143+
foreach(qt_component ${qt_required_components})
144+
list(APPEND QT_LIBRARIES Qt5::${qt_component})
147145
endforeach()
148146

149147
macro(pythonqt_wrap_cpp)
@@ -325,8 +323,9 @@ target_include_directories(PythonQt
325323
)
326324

327325
target_link_libraries(PythonQt
328-
${PYTHON_LIBRARY}
329-
${QT_LIBRARIES}
326+
PUBLIC
327+
${PYTHON_LIBRARY}
328+
${QT_LIBRARIES}
330329
)
331330

332331
#-----------------------------------------------------------------------------

0 commit comments

Comments
 (0)