r24254 by craig - Fix regex selecting arm build by mistake

scribus-commit scribus-commit at lists.scribus.net
Sun Nov 15 00:15:11 UTC 2020


Author: craig
Date: Sun Nov 15 00:15:11 2020
New Revision: 24254

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24254
Log:
Fix regex selecting arm build by mistake

Modified:
    trunk/Scribus/CMakeLists.txt

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24254&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/CMakeLists.txt	Sun Nov 15 00:15:11 2020
@@ -154,13 +154,13 @@
 	set(ARCH64BIT ON)
 endif()
 
-string(REGEX MATCH "(hppa*)" _machine_hppa "${MACHINE}")
+string(REGEX MATCH "(hppa+)" _machine_hppa "${MACHINE}")
 if (_machine_hppa)
 	message(STATUS "Found target Hppa")
 	set(ARCH_HPPA ON)
 endif()
 
-string(REGEX MATCH "(arm*)" _machine_arm "${MACHINE}")
+string(REGEX MATCH "(arm+)" _machine_arm "${MACHINE}")
 if (_machine_arm)
 	message(STATUS "Found target arm")
 	set(ARCH_ARM ON)




More information about the scribus-commit mailing list