Use four-component version number in more locations

Author: dg0yt

CMakeLists.txt

@@ -30,9 +30,9 @@ project(Mapper VERSION 0.8.1.2 LANGUAGES CXX C)
 if(Mapper_VERSION_DISPLAY)
 	message(STATUS "Custom version display string: \"${Mapper_VERSION_DISPLAY}\"")
 elseif(CMAKE_BUILD_TYPE AND NOT CMAKE_BUILD_TYPE MATCHES "Release|MinSizeRel|RelWithDebInfo")
-	set(Mapper_VERSION_DISPLAY "${CMAKE_BUILD_TYPE} ${Mapper_VERSION_MAJOR}.${Mapper_VERSION_MINOR}.${Mapper_VERSION_PATCH}")
+	set(Mapper_VERSION_DISPLAY "${CMAKE_BUILD_TYPE} ${Mapper_VERSION}")
 else()
-	set(Mapper_VERSION_DISPLAY "${Mapper_VERSION_MAJOR}.${Mapper_VERSION_MINOR}.${Mapper_VERSION_PATCH}")
+	set(Mapper_VERSION_DISPLAY "${Mapper_VERSION}")
 endif()
 
 set(Mapper_COPYRIGHT "(C) 2012-2018 The OpenOrienteering developers")

doc/api/Doxyfile.in

@@ -1,5 +1,5 @@
 #
-#    Copyright 2014 Kai Pastor
+#    Copyright 2014, 2015, 2018 Kai Pastor
 #    
 #    This file is part of OpenOrienteering.
 # 
@@ -17,7 +17,7 @@
 #    along with OpenOrienteering.  If not, see <http://www.gnu.org/licenses/>.
 
 PROJECT_NAME           = "@PROJECT_NAME@"
-PROJECT_NUMBER         = "@Mapper_VERSION_MAJOR@.@Mapper_VERSION_MINOR@.@Mapper_VERSION_PATCH@"
+PROJECT_NUMBER         = "@Mapper_VERSION@"
 PROJECT_BRIEF          = "API documentation"
 PROJECT_LOGO           = "@CMAKE_CURRENT_SOURCE_DIR@/../openorienteering.png"
 

doc/manual/CMakeLists.txt

@@ -1,6 +1,6 @@
 #
 #    Copyright 2012, 2013, 2014 Thomas Schöps
-#    Copyright 2012-2017 Kai Pastor
+#    Copyright 2012-2018 Kai Pastor
 #    
 #    This file is part of OpenOrienteering.
 # 
@@ -73,7 +73,7 @@ endif()
 
 set(Mapper_COMPRESSED_HELP "Mapper ${Mapper_VERSION_DISPLAY} Manual.qch")
 set(Mapper_HELP_COLLECTION "Mapper ${Mapper_VERSION_DISPLAY} Manual.qhc")
-set(Mapper_HELP_NAMESPACE "openorienteering.mapper-${Mapper_VERSION_MAJOR}.${Mapper_VERSION_MINOR}.${Mapper_VERSION_PATCH}.help"
+set(Mapper_HELP_NAMESPACE "openorienteering.mapper-${Mapper_VERSION}.help"
   CACHE INTERNAL "The namespace where the current version's help will be located."
 )
 if(NOT MANUAL_SECTIONS)

packaging/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-#    Copyright 2012-2017 Kai Pastor
+#    Copyright 2012-2018 Kai Pastor
 #    
 #    This file is part of OpenOrienteering.
 # 
@@ -107,12 +107,12 @@ else()
 	set(_system_name "${CMAKE_SYSTEM_NAME}-unknown")
 endif()
 set(CPACK_PACKAGE_FILE_NAME 
-    "OpenOrienteering-Mapper-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-${_system_name}")
+    "OpenOrienteering-Mapper-${Mapper_VERSION}-${_system_name}")
 set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING")
 set(CPACK_STRIP_FILES "TRUE")
 
 set(CPACK_SOURCE_PACKAGE_FILE_NAME
-    "openorienteering-mapper_${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-src")
+    "openorienteering-mapper_${Mapper_VERSION}-src")
 set(CPACK_SOURCE_IGNORE_FILES 
   "${PROJECT_BINARY_DIR}"
   "/[.]git/"
@@ -128,16 +128,16 @@ if(WIN32)
 	# Packaging as ZIP archive
 	set(CPACK_GENERATOR_DEFAULT "ZIP")
 	#set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0)
-	set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-	set(CPACK_PACKAGE_EXECUTABLES "Mapper" "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+	set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME} ${Mapper_VERSION}")
+	set(CPACK_PACKAGE_EXECUTABLES "Mapper" "${CPACK_PACKAGE_NAME} ${Mapper_VERSION}")
 
 	find_program(MAKENSIS_EXECUTABLE "makensis")
 	if(MAKENSIS_EXECUTABLE)
 		list(APPEND CPACK_GENERATOR_DEFAULT "NSIS")
 		# The title displayed at the top of the installer
 		set(CPACK_NSIS_PACKAGE_NAME "${CPACK_PACKAGE_NAME}")
 		# The display name string that appears in the Windows Add/Remove Program control panel
-		set(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+		set(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_NAME} ${Mapper_VERSION}")
 		# NSIS start menu links will point to executables in this directory
 		set(CPACK_NSIS_EXECUTABLES_DIRECTORY ".")
 		# A path to the executable that contains the uninstaller icon.
@@ -160,7 +160,7 @@ if(WIN32)
 elseif(APPLE)
 	set(MAPPER_MACOS_SUBDIR "/Mapper.app/Contents/MacOS")
 	set(CPACK_GENERATOR_DEFAULT "DragNDrop")
-	set(CPACK_PACKAGE_EXECUTABLES "Mapper" "OpenOrienteering Mapper ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+	set(CPACK_PACKAGE_EXECUTABLES "Mapper" "OpenOrienteering Mapper ${Mapper_VERSION}")
 	set(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/images/mapper-icon/Mapper.icns")
 	set_target_properties(Mapper PROPERTIES
 	  MACOSX_BUNDLE_INFO_STRING          "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}"

packaging/src/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-#    Copyright 2013, 2014 Kai Pastor
+#    Copyright 2013, 2014, 2018 Kai Pastor
 #    
 #    This file is part of OpenOrienteering.
 # 
@@ -19,10 +19,10 @@
 message(STATUS "Configuring ${PROJECT_NAME} source packaging")
 
 set(Mapper_Source_PREFIX
-  "openorienteering-mapper-${Mapper_VERSION_MAJOR}.${Mapper_VERSION_MINOR}.${Mapper_VERSION_PATCH}")
+  "openorienteering-mapper-${Mapper_VERSION}")
 
 set(Mapper_Source_FILE_NAME
-  "openorienteering-mapper_${Mapper_VERSION_MAJOR}.${Mapper_VERSION_MINOR}.${Mapper_VERSION_PATCH}-src")
+  "openorienteering-mapper_${Mapper_VERSION}-src")
 
 set(Mapper_Source_FORMAT tgz CACHE STRING
   "The archive format for source packages (see `git archive -l` for valid options)")