Author: craig
Date: Mon Sep 15 19:50:20 2014
New Revision: 19508
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19508
Log:
#12691: Require Qt Quick and Print Support modules
Modified:
trunk/Scribus/CMakeLists.txt
Modified: trunk/Scribus/CMakeLists.txt
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=19508&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt (original)
+++ trunk/Scribus/CMakeLists.txt Mon Sep 15 19:50:20 2014
@@ -545,6 +545,18 @@
ELSE(Qt5LinguistTools_FOUND)
MESSAGE(FATAL_ERROR "ERROR: No Qt5LinguistTools found")
ENDIF(Qt5LinguistTools_FOUND)
+ FIND_PACKAGE(Qt5Quick REQUIRED)
+ IF(Qt5Quick_FOUND)
+ MESSAGE(STATUS "----- USE Qt5Quick -----")
+ ELSE(Qt5Quick_FOUND)
+ MESSAGE(FATAL_ERROR "ERROR: No Qt5Quick found")
+ ENDIF(Qt5Quick_FOUND)
+ FIND_PACKAGE(Qt5PrintSupport REQUIRED)
+ IF(Qt5PrintSupport_FOUND)
+ MESSAGE(STATUS "----- USE Qt5PrintSupport -----")
+ ELSE(Qt5PrintSupport_FOUND)
+ MESSAGE(FATAL_ERROR "ERROR: No Qt5PrintSupport found")
+ ENDIF(Qt5PrintSupport_FOUND)
INCLUDE_DIRECTORIES(${Qt5Core_INCLUDE_DIRS})
ADD_DEFINITIONS(${Qt5Core_DEFINITIONS})
INCLUDE_DIRECTORIES(${Qt5Widgets_INCLUDE_DIRS})
@@ -561,6 +573,10 @@
ADD_DEFINITIONS(${Qt5Network_DEFINITIONS})
INCLUDE_DIRECTORIES(${Qt5OpenGL_INCLUDE_DIRS})
ADD_DEFINITIONS(${Qt5OpenGL_DEFINITIONS})
+ INCLUDE_DIRECTORIES(${Qt5Quick_INCLUDE_DIRS})
+ ADD_DEFINITIONS(${Qt5Quick_DEFINITIONS})
+ INCLUDE_DIRECTORIES(${Qt5PrintSupport_INCLUDE_DIRS})
+ ADD_DEFINITIONS(${Qt5PrintSupport_DEFINITIONS})
#>> Qt
#<< ZLIB, PNG
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
