Commit 7d576192 authored by Marcus D. Hanwell's avatar Marcus D. Hanwell

Take the Qt5 find calls out of the conditional

This wasn't always getting called, and then the link line was
surprising. Also simplified the block as those calls only require one
line which makes them easier to read too.
parent d4c03a29
......@@ -13,18 +13,10 @@ IF(NOT (QtTesting_QT_VERSION VERSION_EQUAL "4" OR
ENDIF()
IF(QtTesting_QT_VERSION VERSION_GREATER "4")
IF(NOT Qt5Test_FOUND)
FIND_PACKAGE(Qt5Widgets REQUIRED)
ADD_DEFINITIONS(
${Qt5Widgets_DEFINITIONS}
)
INCLUDE_DIRECTORIES(
${Qt5Widgets_INCLUDE_DIRS}
)
SET(QT_LIBRARIES
${Qt5Widgets_LIBRARIES}
)
ENDIF()
FIND_PACKAGE(Qt5Widgets REQUIRED)
ADD_DEFINITIONS(${Qt5Widgets_DEFINITIONS})
INCLUDE_DIRECTORIES(${Qt5Widgets_INCLUDE_DIRS})
SET(QT_LIBRARIES ${Qt5Widgets_LIBRARIES})
ELSE()
IF(NOT QT4_FOUND)
FIND_PACKAGE(Qt4 REQUIRED)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment