r24017 by craig - Adjust C++ version code to only show one message if selecting C++14/C++17

scribus-commit scribus-commit at lists.scribus.net
Tue Sep 15 20:32:42 UTC 2020


Author: craig
Date: Tue Sep 15 20:32:42 2020
New Revision: 24017

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24017
Log:
Adjust C++ version code to only show one message if selecting C++14/C++17

Modified:
    trunk/Scribus/CMakeLists.txt

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24017&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/CMakeLists.txt	Tue Sep 15 20:32:42 2020
@@ -362,10 +362,10 @@
 
 #C++11 Support
 #as of 1.5.5.svn, require C++11
-#if(WANT_CPP11)
+if(NOT WANT_CPP14 AND NOT WANT_CPP17)
 	message(STATUS "Enabling C++11 compiler features")
 	set(CMAKE_CXX_STANDARD 11)
-#endif()
+endif()
 if (WANT_CPP14)
 	message(STATUS "Enabling C++14 compiler features")
 	set(CMAKE_CXX_STANDARD 14)




More information about the scribus-commit mailing list