From 178811af43c4d6edbf5b85b2ec9b5621826d5c2b Mon Sep 17 00:00:00 2001 From: lethosor Date: Sat, 7 Nov 2015 18:07:48 -0500 Subject: [PATCH] Add GCC version to package filename on Linux --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f56c6817..e0c70c1db 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -248,11 +248,14 @@ if (BUILD_DOCS) endif() # Packaging with CPack! +SET(DFHACK_PACKAGE_SUFFIX "") IF(UNIX) 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") @@ -263,7 +266,7 @@ IF(APPLE) ELSE() set(DFHACK_PACKAGE_PLATFORM_NAME ${CMAKE_SYSTEM_NAME}) ENDIF() -set(CPACK_PACKAGE_FILE_NAME "dfhack-${DFHACK_VERSION}-${DFHACK_PACKAGE_PLATFORM_NAME}") +set(CPACK_PACKAGE_FILE_NAME "dfhack-${DFHACK_VERSION}-${DFHACK_PACKAGE_PLATFORM_NAME}${DFHACK_PACKAGE_SUFFIX}") INCLUDE(CPack) #INCLUDE(FindSphinx.cmake)