From c0d8e328dcc9ab11705e54db74b6e94a675c0a0f Mon Sep 17 00:00:00 2001
From: Anurag Khandelwal <anuragk@berkeley.edu>
Date: Thu, 5 Jul 2018 17:27:07 -0700
Subject: [PATCH] Update CPack tar package naming on MacOS

---
 CMakeLists.txt | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a21ee27ef..b630f1593 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,10 +92,20 @@ set(CPACK_RPM_PACKAGE_LICENSE "BSD")
 set(CPACK_RPM_PACKAGE_URL "${PACKAGE_URL}")
 set(CPACK_RPM_CHANGELOG_FILE "${CMAKE_CURRENT_LIST_DIR}/ChangeLog.txt")
 
+string(TOLOWER "${CMAKE_SYSTEM_NAME}" CPACK_SYSTEM_NAME)
 if (APPLE)
-  set(CPACK_PACKAGE_ARCHITECTURE darwin)
+  execute_process(
+          COMMAND uname -p
+          RESULT_VARIABLE RV
+          OUTPUT_VARIABLE CPACK_PACKAGE_ARCHITECTURE
+  )
+  execute_process(COMMAND uname -m OUTPUT_VARIABLE CPACK_PACKAGE_ARCHITECTURE)
+  if (CPACK_PACKAGE_ARCHITECTURE MATCHES "x86_64")
+    set(CPACK_PACKAGE_ARCHITECTURE amd64)
+  else ()
+    set(CPACK_PACKAGE_ARCHITECTURE i386)
+  endif ()
 else ()
-  string(TOLOWER "${CMAKE_SYSTEM_NAME}" CPACK_SYSTEM_NAME)
   if (CMAKE_CXX_FLAGS MATCHES "-m32")
     set(CPACK_PACKAGE_ARCHITECTURE i386)
   else ()