bzr commit into mysql-next-mr-wl5569 branch (jonathan.perkin:3200)

[Jonathan Perkin]

#At file:///Users/jperkin/bzr-mysql/mysql-next-mr-wl5563-labs/ based on revid:andrei.elkin@stripped

 3200 Jonathan Perkin	2011-01-07
      Allow the version field in the package name to be overridden.

    modified:
      cmake/package_name.cmake
=== modified file 'cmake/package_name.cmake'
--- a/cmake/package_name.cmake	2010-07-14 16:33:33 +0000
+++ b/cmake/package_name.cmake	2011-01-07 14:47:21 +0000
@@ -18,7 +18,7 @@
 INCLUDE(CheckTypeSize)
 CHECK_TYPE_SIZE("void *" SIZEOF_VOIDP)
 MACRO(GET_PACKAGE_FILE_NAME Var)
-IF(NOT VERSION)
+  IF(NOT VERSION)
     MESSAGE(FATAL_ERROR 
      "Variable VERSION needs to be set prior to calling GET_PACKAGE_FILE_NAME")
   ENDIF()
@@ -116,7 +116,12 @@ IF(NOT VERSION)
     SET(PRODUCT_TAG)
   ENDIF()
 
-  SET(package_name "mysql${PRODUCT_TAG}-${VERSION}-${SYSTEM_NAME_AND_PROCESSOR}")
+  # Allow the package name version to be overridden (e.g. for snapshots)
+  IF(NOT PACKAGE_VERNAME)
+    SET(PACKAGE_VERNAME ${VERSION})
+  ENDIF
+
+  SET(package_name "mysql${PRODUCT_TAG}-${PACKAGE_VERNAME}-${SYSTEM_NAME_AND_PROCESSOR}")
   
   # Sometimes package suffix is added (something like "-icc-glibc23")
   IF(PACKAGE_SUFFIX)


Attachment: [text/bzr-bundle] bzr/[e-mail]