Commit 8a6abd75 authored by Utkarsh Ayachit's avatar Utkarsh Ayachit

Merge pull request #24 from cryos/qt5-overlinking

Take the Qt5 find calls out of the conditional
parents fd9f01f0 7d576192
......@@ -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