Revision: 45732
          http://brlcad.svn.sourceforge.net/brlcad/?rev=45732&view=rev
Author:   starseeker
Date:     2011-07-29 19:03:17 +0000 (Fri, 29 Jul 2011)

Log Message:
-----------
Provide an option to allow RPMS to have a version-specific unique name, to make 
it simpler to allow for installing multiple versions of BRL-CAD on one system.

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

Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2011-07-29 09:33:17 UTC (rev 45731)
+++ brlcad/trunk/CMakeLists.txt 2011-07-29 19:03:17 UTC (rev 45732)
@@ -1519,6 +1519,8 @@
 # CPack is used to produce tgz files, RPMS, etc.  If SUBBUILD is enabled this
 # becomes the responsibility of the parent project.
 IF(NOT BRLCAD-IS_SUBBUILD)
+       OPTION(BRLCAD-VERSIONED_RPM_NAME "Incorporate BRL-CAD version into RPM 
package name" OFF)
+       MARK_AS_ADVANCED(BRLCAD-VERSIONED_RPM_NAME)
        SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "BRL-CAD - a powerful 
cross-platform open source solid modeling system")
        SET(CPACK_PACKAGE_VENDOR "BRL-CAD Development Team")
        SET(CPACK_RESOURCE_FILE_README ${CMAKE_CURRENT_SOURCE_DIR}/README)
@@ -1526,6 +1528,9 @@
        SET(CPACK_PACKAGE_VERSION_MAJOR ${BRLCAD_MAJOR_VERSION})
        SET(CPACK_PACKAGE_VERSION_MINOR ${BRLCAD_MINOR_VERSION})
        SET(CPACK_PACKAGE_VERSION_PATCH ${BRLCAD_PATCH_VERSION})
+       IF(BRLCAD-VERSIONED_RPM_NAME)
+               SET(CPACK_RPM_PACKAGE_NAME      
BRL-CAD${BRLCAD_MAJOR_VERSION}${BRLCAD_MINOR_VERSION}${BRLCAD_PATCH_VERSION})
+       ENDIF(BRLCAD-VERSIONED_RPM_NAME)
 
        IF(UNIX)
                SET(CPACK_STRIP_FILES TRUE)


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

------------------------------------------------------------------------------
Got Input?   Slashdot Needs You.
Take our quick survey online.  Come on, we don't ask for help often.
Plus, you'll get a chance to win $100 to spend on ThinkGeek.
http://p.sf.net/sfu/slashdot-survey
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits

Reply via email to