Revision: 45737
http://brlcad.svn.sourceforge.net/brlcad/?rev=45737&view=rev
Author: brlcad
Date: 2011-07-31 14:37:57 +0000 (Sun, 31 Jul 2011)
Log Message:
-----------
CAD_VERSION was only needed to bridge an m4 variable to a shell variable, cmake
can just set BRLCAD_VERSION. on that note, use it where triplets are called
for and keeping with our naming guidelines.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2011-07-31 14:12:27 UTC (rev 45736)
+++ brlcad/trunk/CMakeLists.txt 2011-07-31 14:37:57 UTC (rev 45737)
@@ -313,8 +313,7 @@
FILE(READ ${BRLCAD_SOURCE_DIR}/include/conf/PATCH BRLCAD_PATCH_VERSION)
STRING(STRIP ${BRLCAD_PATCH_VERSION} BRLCAD_PATCH_VERSION)
-SET(CAD_VERSION
"${BRLCAD_MAJOR_VERSION}.${BRLCAD_MINOR_VERSION}.${BRLCAD_PATCH_VERSION}")
-SET(BRLCAD_VERSION "${CAD_VERSION}")
+SET(BRLCAD_VERSION
"${BRLCAD_MAJOR_VERSION}.${BRLCAD_MINOR_VERSION}.${BRLCAD_PATCH_VERSION}")
#---------------------------------------------------------------------
# Write out entries to populate a tm struct to be used for time deltas
@@ -403,9 +402,9 @@
IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
IF(NOT WIN32)
IF ("${CMAKE_BUILD_TYPE}" MATCHES "Release")
- SET(CMAKE_INSTALL_PREFIX
"/usr/brlcad/rel-${BRLCAD_MAJOR_VERSION}.${BRLCAD_MINOR_VERSION}.${BRLCAD_PATCH_VERSION}")
+ SET(CMAKE_INSTALL_PREFIX
"/usr/brlcad/rel-${BRLCAD_VERSION}")
ELSEIF ("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
- SET(CMAKE_INSTALL_PREFIX
"/usr/brlcad/dev-${BRLCAD_MAJOR_VERSION}.${BRLCAD_MINOR_VERSION}.${BRLCAD_PATCH_VERSION}")
+ SET(CMAKE_INSTALL_PREFIX
"/usr/brlcad/dev-${BRLCAD_VERSION}")
ELSE ("${CMAKE_BUILD_TYPE}" MATCHES "Release")
SET(CMAKE_INSTALL_PREFIX "/usr/brlcad")
ENDIF ("${CMAKE_BUILD_TYPE}" MATCHES "Release")
@@ -1529,7 +1528,7 @@
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})
+ SET(CPACK_RPM_PACKAGE_NAME "BRL-CAD_${BRLCAD_VERSION}")
ENDIF(BRLCAD-VERSIONED_RPM_NAME)
IF(UNIX)
@@ -1550,9 +1549,9 @@
SET(CPACK_RPM_PACKAGE_GROUP "Applications/Engineering")
ENDIF(RPMBUILD_EXEC)
- SET(CPACK_PACKAGE_FILE_NAME
"BRL-CAD_${BRLCAD_MAJOR_VERSION}.${BRLCAD_MINOR_VERSION}.${BRLCAD_PATCH_VERSION}_${CMAKE_SYSTEM_NAME}_${CMAKE_SYSTEM_PROCESSOR}")
+ SET(CPACK_PACKAGE_FILE_NAME
"BRL-CAD_${BRLCAD_VERSION}_${CMAKE_SYSTEM_NAME}_${CMAKE_SYSTEM_PROCESSOR}")
ELSE(UNIX AND NOT APPLE)
- SET(CPACK_PACKAGE_FILE_NAME
"BRL-CAD_${BRLCAD_MAJOR_VERSION}.${BRLCAD_MINOR_VERSION}.${BRLCAD_PATCH_VERSION}_${CMAKE_SYSTEM_PROCESSOR}")
+ SET(CPACK_PACKAGE_FILE_NAME
"BRL-CAD_${BRLCAD_VERSION}_${CMAKE_SYSTEM_PROCESSOR}")
ENDIF(UNIX AND NOT APPLE)
IF(WIN32)
@@ -1569,7 +1568,7 @@
ENDIF(WIN32)
SET(CPACK_SOURCE_GENERATOR TGZ TBZ2 ZIP)
- SET(CPACK_SOURCE_PACKAGE_FILE_NAME
"brlcad-${BRLCAD_MAJOR_VERSION}.${BRLCAD_MINOR_VERSION}.${BRLCAD_PATCH_VERSION}")
+ SET(CPACK_SOURCE_PACKAGE_FILE_NAME "brlcad-${BRLCAD_VERSION}")
SET(CPACK_SOURCE_IGNORE_FILES "\\\\.svn/")
CONFIGURE_FILE("${BRLCAD_CMAKE_DIR}/BRLCAD_CPackOptions.cmake.in"
"${CMAKE_BINARY_DIR}/BRLCAD_CPackOptions.cmake" @ONLY)
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
