From 1e42f97e76575a98cf6b3567c54fa76ff3da2516 Mon Sep 17 00:00:00 2001
From: lethosor <lethosor@gmail.com>
Date: Sat, 7 Nov 2015 20:27:48 -0500
Subject: [PATCH] Add GCC version to OS X package names and remove trailing
 newlines

---
 CMakeLists.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0c70c1db..159db42f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -250,12 +250,13 @@ endif()
 # Packaging with CPack!
 SET(DFHACK_PACKAGE_SUFFIX "")
 IF(UNIX)
+    execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
+    string(STRIP ${GCC_VERSION} GCC_VERSION)
+    SET(DFHACK_PACKAGE_SUFFIX "-gcc-${GCC_VERSION}")
     if(APPLE)
         SET(CPACK_GENERATOR "ZIP;TBZ2")
     else()
         SET(CPACK_GENERATOR "TBZ2")
-        execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
-        SET(DFHACK_PACKAGE_SUFFIX "-gcc-${GCC_VERSION}")
     endif()
 ELSEIF(WIN32)
     SET(CPACK_GENERATOR "ZIP")