r21778 by craig - #14609: Fix Qt version detection

scribus-commit scribus-commit at lists.scribus.net
Sun Feb 12 19:02:28 UTC 2017


Author: craig
Date: Sun Feb 12 19:02:28 2017
New Revision: 21778

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21778
Log:
#14609: Fix Qt version detection

Modified:
    trunk/Scribus/CMakeLists.txt

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21778&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/CMakeLists.txt	Sun Feb 12 19:02:28 2017
@@ -601,55 +601,55 @@
 set (QT_MIN_VERSION "5.5.0")
 set(CMAKE_PREFIX_PATH "${QT_PREFIX}/lib/cmake")
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
-find_package(Qt5Core REQUIRED)
+find_package(Qt5Core ${QT_MIN_VERSION} REQUIRED)
 if(Qt5Core_FOUND)
     message(STATUS "----- USE QT 5-----")
 else()
     message(FATAL_ERROR "ERROR: No QT 5 found")
 endif()
-find_package(Qt5Widgets REQUIRED)
+find_package(Qt5Widgets ${QT_MIN_VERSION} REQUIRED)
 if(Qt5Widgets_FOUND)
     message(STATUS "----- USE QT Widgets-----")
 else()
     message(FATAL_ERROR "ERROR: No QT Widgets found")
 endif()
-find_package(Qt5Gui REQUIRED)
+find_package(Qt5Gui ${QT_MIN_VERSION} REQUIRED)
 if(Qt5Gui_FOUND)
     message(STATUS "----- USE Qt5Gui -----")
 else()
     message(FATAL_ERROR "ERROR: Qt5Gui found")
 endif()
-find_package(Qt5Xml REQUIRED)
+find_package(Qt5Xml ${QT_MIN_VERSION} REQUIRED)
 if(Qt5Xml_FOUND)
     message(STATUS "----- USE QT 5 XML -----")
 else()
     message(FATAL_ERROR "ERROR: No QT 5 XML found")
 endif()
-find_package(Qt5Network REQUIRED)
+find_package(Qt5Network ${QT_MIN_VERSION} REQUIRED)
 if(Qt5Network_FOUND)
     message(STATUS "----- USE Qt5Network -----")
 else()
     message(FATAL_ERROR "ERROR: No Qt5Network found")
 endif()
-find_package(Qt5OpenGL REQUIRED)
+find_package(Qt5OpenGL ${QT_MIN_VERSION} REQUIRED)
 if(Qt5OpenGL_FOUND)
     message(STATUS "----- USE Qt5OpenGL -----")
 else()
     message(FATAL_ERROR "ERROR: No Qt5OpenGL found")
 endif()
-find_package(Qt5LinguistTools REQUIRED)
+find_package(Qt5LinguistTools ${QT_MIN_VERSION} REQUIRED)
 if(Qt5LinguistTools_FOUND)
     message(STATUS "----- USE Qt5LinguistTools -----")
 else()
     message(FATAL_ERROR "ERROR: No Qt5LinguistTools found")
 endif()
-#find_package(Qt5Quick REQUIRED)
+#find_package(Qt5Quick ${QT_MIN_VERSION} REQUIRED)
 #if(Qt5Quick_FOUND)
 #    message(STATUS "----- USE Qt5Quick -----")
 #else()
 #    message(FATAL_ERROR "ERROR: No Qt5Quick found")
 #endif()
-find_package(Qt5PrintSupport REQUIRED)
+find_package(Qt5PrintSupport ${QT_MIN_VERSION} REQUIRED)
 if(Qt5PrintSupport_FOUND)
     message(STATUS "----- USE Qt5PrintSupport -----")
 else()




More information about the scribus-commit mailing list