[brlcad-commits] SF.net SVN: brlcad:[49119] brlcad/trunk/CMakeLists.txt
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <sta...@us...> - 2012-01-26 22:28:15
|
Revision: 49119 http://brlcad.svn.sourceforge.net/brlcad/?rev=49119&view=rev Author: starseeker Date: 2012-01-26 22:28:08 +0000 (Thu, 26 Jan 2012) Log Message: ----------- set version, THEN define DATA_DIR... Modified Paths: -------------- brlcad/trunk/CMakeLists.txt Modified: brlcad/trunk/CMakeLists.txt =================================================================== --- brlcad/trunk/CMakeLists.txt 2012-01-26 22:19:13 UTC (rev 49118) +++ brlcad/trunk/CMakeLists.txt 2012-01-26 22:28:08 UTC (rev 49119) @@ -215,6 +215,19 @@ include(${CMAKE_SOURCE_DIR}/misc/CMake/CMakeFiles.cmake) #--------------------------------------------------------------------- +# Define the current BRL-CAD version. +# See HACKING for details on how to properly update the version + +file(READ ${BRLCAD_SOURCE_DIR}/include/conf/MAJOR BRLCAD_MAJOR_VERSION) +string(STRIP ${BRLCAD_MAJOR_VERSION} BRLCAD_MAJOR_VERSION) +file(READ ${BRLCAD_SOURCE_DIR}/include/conf/MINOR BRLCAD_MINOR_VERSION) +string(STRIP ${BRLCAD_MINOR_VERSION} BRLCAD_MINOR_VERSION) +file(READ ${BRLCAD_SOURCE_DIR}/include/conf/PATCH BRLCAD_PATCH_VERSION) +string(STRIP ${BRLCAD_PATCH_VERSION} BRLCAD_PATCH_VERSION) + +set(BRLCAD_VERSION "${BRLCAD_MAJOR_VERSION}.${BRLCAD_MINOR_VERSION}.${BRLCAD_PATCH_VERSION}") + +#--------------------------------------------------------------------- # Define relative install locations. Don't set these if they have already # been set by some other means (like a higher level CMakeLists.txt file # including this one.) @@ -398,17 +411,6 @@ endif(_orig_lang) #--------------------------------------------------------------------- -# See HACKING for details on how to properly update the version -file(READ ${BRLCAD_SOURCE_DIR}/include/conf/MAJOR BRLCAD_MAJOR_VERSION) -string(STRIP ${BRLCAD_MAJOR_VERSION} BRLCAD_MAJOR_VERSION) -file(READ ${BRLCAD_SOURCE_DIR}/include/conf/MINOR BRLCAD_MINOR_VERSION) -string(STRIP ${BRLCAD_MINOR_VERSION} BRLCAD_MINOR_VERSION) -file(READ ${BRLCAD_SOURCE_DIR}/include/conf/PATCH BRLCAD_PATCH_VERSION) -string(STRIP ${BRLCAD_PATCH_VERSION} BRLCAD_PATCH_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 # later if(NOT IS_SUBBUILD) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |