r22522 by craig - Some minor cmake adjustments

scribus-commit scribus-commit at lists.scribus.net
Sat May 5 13:51:55 UTC 2018


Author: craig
Date: Sat May  5 13:51:55 2018
New Revision: 22522

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22522
Log:
Some minor cmake adjustments

Modified:
    trunk/Scribus/CMakeLists.txt
    trunk/Scribus/cmake/modules/FindHUNSPELL.cmake

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22522&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/CMakeLists.txt	Sat May  5 13:51:55 2018
@@ -685,10 +685,10 @@
 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(STATUS "Your Qt version is 5.7.0 or superior, enabling C++11 compiler features")
-	set(WANT_CPP11 1)
-endif()
+#if (NOT WANT_CPP11 AND Qt5Widgets_VERSION_MAJOR EQUAL 5 AND Qt5Widgets_VERSION_MINOR GREATER 6)
+#	message(STATUS "Your Qt version is 5.7.0 or superior, enabling C++11 compiler features")
+#	set(WANT_CPP11 1)
+#endif()
 #>> Qt
 
 

Modified: trunk/Scribus/cmake/modules/FindHUNSPELL.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22522&path=/trunk/Scribus/cmake/modules/FindHUNSPELL.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindHUNSPELL.cmake	(original)
+++ trunk/Scribus/cmake/modules/FindHUNSPELL.cmake	Sat May  5 13:51:55 2018
@@ -28,7 +28,7 @@
 #set(HUNSPELL_MINOR_VERSION ${CMAKE_MATCH_1})
 if(CMAKE_MATCH_1 GREATER 4)
 	set(HUNSPELL_NEWAPI 1)
-	message(STATUS "New HUNSPELL API found")
+	message(STATUS "New HUNSPELL API found. Hunspell version ${HUNSPELL_VERSION}")
 endif()
 
 #find_path(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx )




More information about the scribus-commit mailing list