r21379 by craig -

scribus-commit scribus-commit at lists.scribus.net
Thu Jun 16 20:19:15 UTC 2016


Author: craig
Date: Thu Jun 16 20:19:15 2016
New Revision: 21379

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21379
Log:
If WANT_CPP11 is not set and Qt 5.7.0+ is used, error

Modified:
    trunk/Scribus/CMakeLists.txt

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21379&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/CMakeLists.txt	Thu Jun 16 20:19:15 2016
@@ -648,6 +648,9 @@
 ADD_DEFINITIONS(${Qt5PrintSupport_DEFINITIONS})
 
 MESSAGE(STATUS "Qt VERSION: ${Qt5Widgets_VERSION}")
+IF (NOT WANT_CPP11 AND Qt5Widgets_VERSION_MAJOR EQUAL 5 AND Qt5Widgets_VERSION_MINOR GREATER 6)
+    MESSAGE(FATAL_ERROR "Your Qt version is at least 5.7.0, please set CMake command line option -DWANT_CPP11=1 for C++ 11 and Qt 5.7.0 support")
+ENDIF (NOT WANT_CPP11 AND Qt5Widgets_VERSION_MAJOR EQUAL 5 AND Qt5Widgets_VERSION_MINOR GREATER 6)
 #>> Qt
 
 #<< ZLIB, PNG




More information about the scribus-commit mailing list