r21469 by craig - #14329: Force C++11 when Qt 5.7+ is found and remove the need to set WANT_CPP11 in this case

[scribus-commit]

Author: craig
Date: Wed Oct 26 20:41:52 2016
New Revision: 21469

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21469
Log:
#14329: Force C++11 when Qt 5.7+ is found and remove the need to set WANT_CPP11 in this case

Modified:
    trunk/Scribus/CMakeLists.txt

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21469&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/CMakeLists.txt	Wed Oct 26 20:41:52 2016
@@ -383,12 +383,6 @@
 	SET(LIBDIR "${LIB_DIR_NAME}/${MAIN_DIR_NAME}${TAG_VERSION}/")
 ENDIF (APPLEBUNDLE)
 ADD_DEFINITIONS("-DLIBDIR=\\\"${CMAKE_INSTALL_PREFIX}/${LIBDIR}\\\"")
-
-#C++11 Support
-IF(WANT_CPP11)
-	MESSAGE(STATUS "Enabling C++11 compiler features")
-	set(CMAKE_CXX_STANDARD 11)
-ENDIF(WANT_CPP11)
 
 #PLUGINS
 IF(WIN32)
@@ -661,9 +655,17 @@
 
 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")
+    MESSAGE(STATUS "Your Qt version is 5.7.0 or superior, enabling C++11 compiler features")
+	SET(WANT_CPP11 1)
 ENDIF (NOT WANT_CPP11 AND Qt5Widgets_VERSION_MAJOR EQUAL 5 AND Qt5Widgets_VERSION_MINOR GREATER 6)
 #>> Qt
+
+
+#C++11 Support
+IF(WANT_CPP11)
+    MESSAGE(STATUS "Enabling C++11 compiler features")
+	set(CMAKE_CXX_STANDARD 11)
+ENDIF(WANT_CPP11)
 
 #<< ZLIB, PNG
 IF (WIN32)