songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Introduce CGAL_DOC_VERSION

This commit is contained in:
Philipp Möller 2016-02-11 15:08:04 +01:00
parent 50f7ad33c8
commit 3b63763f5d
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/doc/CMakeLists.txt
View File

@ -200,6 +200,11 @@ else()
set(CGAL_RELEASE_YEAR_ID "${CGAL_BUILD_YEAR2}a") set(CGAL_RELEASE_YEAR_ID "${CGAL_BUILD_YEAR2}a")
endif() endif()
# Introduce our own version variable. This way we avoid tying this too
# closely to the convoluted versioning code and can adapt without a
# huge diff.
set(CGAL_DOC_VERSION ${CGAL_CREATED_VERSION_NUM})
## generate how_to_cite files ## generate how_to_cite files
if(PYTHONINTERP_FOUND) if(PYTHONINTERP_FOUND)
execute_process(COMMAND ${PYTHON_EXECUTABLE} execute_process(COMMAND ${PYTHON_EXECUTABLE}

10
Installation/CMakeLists.txt
View File

@ -125,7 +125,6 @@ if ( CGAL_BRANCH_BUILD )
file(STRINGS "${CGAL_MAINTENANCE_PACKAGE_DIR}/release_building/MINOR_NUMBER" CGAL_MINOR_VERSION REGEX "[0-9]*") file(STRINGS "${CGAL_MAINTENANCE_PACKAGE_DIR}/release_building/MINOR_NUMBER" CGAL_MINOR_VERSION REGEX "[0-9]*")
file(STRINGS "${CGAL_MAINTENANCE_PACKAGE_DIR}/release_building/BUGFIX_NUMBER" CGAL_BUGFIX_VERSION REGEX "[0-9]*") file(STRINGS "${CGAL_MAINTENANCE_PACKAGE_DIR}/release_building/BUGFIX_NUMBER" CGAL_BUGFIX_VERSION REGEX "[0-9]*")
set(CGAL_BUILD_VERSION 900)
file(REMOVE ${CMAKE_BINARY_DIR}/VERSION) file(REMOVE ${CMAKE_BINARY_DIR}/VERSION)
if (CGAL_BUGFIX_VERSION AND CGAL_BUGFIX_VERSION GREATER 0) if (CGAL_BUGFIX_VERSION AND CGAL_BUGFIX_VERSION GREATER 0)
set(CGAL_CREATED_VERSION_NUM "${CGAL_MAJOR_VERSION}.${CGAL_MINOR_VERSION}.${CGAL_BUGFIX_VERSION}") set(CGAL_CREATED_VERSION_NUM "${CGAL_MAJOR_VERSION}.${CGAL_MINOR_VERSION}.${CGAL_BUGFIX_VERSION}")
@ -136,9 +135,8 @@ if ( CGAL_BRANCH_BUILD )
# Accessed in the documentation. # Accessed in the documentation.
set(CGAL_CREATED_VERSION_NUM ${CGAL_CREATED_VERSION_NUM} PARENT_SCOPE) set(CGAL_CREATED_VERSION_NUM ${CGAL_CREATED_VERSION_NUM} PARENT_SCOPE)
# TODO EBEB set number of internal release (replace "900") # TODO EBEB set number of internal release (replace "900")
set(CGAL_BUILD_VERSION 900)
set(CGAL_CREATED_VERSION "${CGAL_CREATED_VERSION_NUM}-I-${CGAL_BUILD_VERSION}") set(CGAL_CREATED_VERSION "${CGAL_CREATED_VERSION_NUM}-I-${CGAL_BUILD_VERSION}")
set(CGAL_VERSION "${CGAL_CREATED_VERSION_NUM}-I-${CGAL_BUILD_VERSION}") set(CGAL_VERSION "${CGAL_CREATED_VERSION_NUM}-I-${CGAL_BUILD_VERSION}")
@ -288,7 +286,13 @@ else()
set(CGAL_BUGFIX_VERSION 0) set(CGAL_BUGFIX_VERSION 0)
endif() endif()
if(CGAL_BUGFIX_VERSION AND CGAL_BUGFIX_VERSION GREATER 0)
set(CGAL_CREATED_VERSION_NUM "${CGAL_MAJOR_VERSION}.${CGAL_MINOR_VERSION}.${CGAL_BUGFIX_VERSION}")
else()
set(CGAL_CREATED_VERSION_NUM "${CGAL_MAJOR_VERSION}.${CGAL_MINOR_VERSION}")
endif() endif()
endif()
#-------------------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------------------
# #