[brlcad-commits] SF.net SVN: brlcad:[70362] brlcad/trunk/CMakeLists.txt

[<sta...@us...>]

Revision: 70362
          http://sourceforge.net/p/brlcad/code/70362
Author:   starseeker
Date:     2017-10-10 19:52:14 +0000 (Tue, 10 Oct 2017)
Log Message:
-----------
Only append RPM package release string if we need it.

Modified Paths:
--------------
    brlcad/trunk/CMakeLists.txt

Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt	2017-10-10 01:48:42 UTC (rev 70361)
+++ brlcad/trunk/CMakeLists.txt	2017-10-10 19:52:14 UTC (rev 70362)
@@ -3345,10 +3345,13 @@
   endif(RPMBUILD_EXEC AND NOT CPACK_RPM_SKIP)
 
   if(${CMAKE_WORD_SIZE} MATCHES "32BIT" AND ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
-    set(CPACK_PACKAGE_FILE_NAME "BRL-CAD_${BRLCAD_VERSION}_${CMAKE_SYSTEM_NAME}_x86_${CPACK_RPM_PACKAGE_RELEASE}")
+    set(CPACK_PACKAGE_FILE_NAME "BRL-CAD_${BRLCAD_VERSION}_${CMAKE_SYSTEM_NAME}_x86")
   else(${CMAKE_WORD_SIZE} MATCHES "32BIT" AND ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
-    set(CPACK_PACKAGE_FILE_NAME "BRL-CAD_${BRLCAD_VERSION}_${CMAKE_SYSTEM_NAME}_${CMAKE_SYSTEM_PROCESSOR}_${CPACK_RPM_PACKAGE_RELEASE}")
+    set(CPACK_PACKAGE_FILE_NAME "BRL-CAD_${BRLCAD_VERSION}_${CMAKE_SYSTEM_NAME}_${CMAKE_SYSTEM_PROCESSOR}")
   endif(${CMAKE_WORD_SIZE} MATCHES "32BIT" AND ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+  if(CPACK_RPM_PACKAGE_RELEASE)
+    set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}_${CPACK_RPM_PACKAGE_RELEASE}")
+  endif(CPACK_RPM_PACKAGE_RELEASE)
 
   if(WIN32)
     set(CPACK_GENERATOR NSIS)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.