Revision: 55789
http://sourceforge.net/p/brlcad/code/55789
Author: tbrowder2
Date: 2013-06-15 09:33:58 +0000 (Sat, 15 Jun 2013)
Log Message:
-----------
make provision for an integer version of the BRL-CAD version number so it can
be compared with cpp macros
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2013-06-15 03:52:25 UTC (rev 55788)
+++ brlcad/trunk/CMakeLists.txt 2013-06-15 09:33:58 UTC (rev 55789)
@@ -213,6 +213,18 @@
string(STRIP ${BRLCAD_PATCH_VERSION} BRLCAD_PATCH_VERSION)
set(BRLCAD_VERSION
"${BRLCAD_MAJOR_VERSION}.${BRLCAD_MINOR_VERSION}.${BRLCAD_PATCH_VERSION}")
+# the following number should be a single integer MMmmpp (e.g., 72400)
+if (${BRLCAD_MINOR_VERSION} STRLESS "10")
+ set(BRLCAD_MINOR_VERSION_NUM "0${BRLCAD_MINOR_VERSION}")
+else
+ set(BRLCAD_MINOR_VERSION_NUM "${BRLCAD_MINOR_VERSION}")
+endif
+if (${BRLCAD_PATCH_VERSION} STRLESS "10")
+ set(BRLCAD_PATCH_VERSION_NUM "0${BRLCAD_PATCH_VERSION}")
+else
+ set(BRLCAD_PATCH_VERSION_NUM "${BRLCAD_PATCH_VERSION}")
+endif
+set(BRLCAD_VERSION_NUMBER
"${BRLCAD_MAJOR_VERSION}${BRLCAD_MINOR_VERSION_NUM}${BRLCAD_PATCH_VERSION_NUM}")
#---------------------------------------------------------------------
# Define relative install locations. Don't set these if they have already
@@ -772,6 +784,7 @@
CONFIG_H_APPEND(BRLCAD "#define BRLCAD_MAN_DIR \"${MAN_DIR}\"\n")
CONFIG_H_APPEND(BRLCAD "#define PACKAGE_VERSION \"${BRLCAD_VERSION}\"\n")
CONFIG_H_APPEND(BRLCAD "#define VERSION \"${BRLCAD_VERSION}\"\n")
+CONFIG_H_APPEND(BRLCAD "#define BRLCAD_VERSION_NUMBER
${BRLCAD_VERSION_NUMBER}\n")
#----------------------------------------------------------------------
# Decide whether to do a 32 or a 64 bit build.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
