From 3b63763f5d21e8248c658cf20cd6b5cb37a43f46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20M=C3=B6ller?= <bootsarehax@gmail.com>
Date: Thu, 11 Feb 2016 15:08:04 +0100
Subject: [PATCH] Introduce CGAL_DOC_VERSION

---
 Documentation/doc/CMakeLists.txt |  5 +++++
 Installation/CMakeLists.txt      | 12 ++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Documentation/doc/CMakeLists.txt b/Documentation/doc/CMakeLists.txt
index 8b8ae08fc44..afadb27b3f9 100644
--- a/Documentation/doc/CMakeLists.txt
+++ b/Documentation/doc/CMakeLists.txt
@@ -200,6 +200,11 @@ else()
   set(CGAL_RELEASE_YEAR_ID "${CGAL_BUILD_YEAR2}a")
 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
 if(PYTHONINTERP_FOUND)
   execute_process(COMMAND ${PYTHON_EXECUTABLE}
diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt
index e99fca75946..3ed8d83072c 100644
--- a/Installation/CMakeLists.txt
+++ b/Installation/CMakeLists.txt
@@ -125,20 +125,18 @@ 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/BUGFIX_NUMBER" CGAL_BUGFIX_VERSION REGEX "[0-9]*")
 
-  set(CGAL_BUILD_VERSION 900)
   file(REMOVE ${CMAKE_BINARY_DIR}/VERSION)
   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()
-  
+
   # Accessed in the documentation.
   set(CGAL_CREATED_VERSION_NUM ${CGAL_CREATED_VERSION_NUM} PARENT_SCOPE)
 
-  
-  
   # 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_VERSION "${CGAL_CREATED_VERSION_NUM}-I-${CGAL_BUILD_VERSION}")
 
@@ -288,8 +286,14 @@ else()
     set(CGAL_BUGFIX_VERSION 0)
   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()
 
+
 #--------------------------------------------------------------------------------------------------
 #
 #                                    -= BASIC SETUP =-