Merge brnach 'stable-1.2'

2017-11-24 09:50:57 +09:00
parent 79e4775cd3 55076d0bb0
commit 90b1fb57f0
20 changed files with 137 additions and 42 deletions
--- a/cmake/linux/package_linux.sh.in
+++ b/cmake/linux/package_linux.sh.in
@@ -42,6 +42,9 @@ function skipped {
 	echo -e "   ${PLAIN}[${YELLOW}skipped${PLAIN}] ${1}"
 }

+# Blindly assume system arch is appimage arch
+ARCH=$(arch)
+export ARCH

 # Check for problematic install locations
 INSTALL=$(echo "@CMAKE_INSTALL_PREFIX@" | sed 's/\/*$//g')