CMake: set VERSION in project command in top-level CMakeLists.cmake

CMakeLists.txt

@@ -14,6 +14,7 @@ set(CONFIGURABLES_DIR ${CMAKE_SOURCE_DIR}/cmake/configurables)
 include(PreventInSourceBuilds)
 
 project(BornAgain
+    VERSION 1.17.99
     DESCRIPTION "BornAgain: simulate and fit scattering at grazing incidence."
     HOMEPAGE_URL https://www.bornagainproject.org
     LANGUAGES CXX)
@@ -24,8 +25,6 @@ add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} -LE Fullcheck)
 add_custom_target(fullcheck COMMAND ${CMAKE_CTEST_COMMAND})
    # => 'make check' is an alias for 'ctest'
 
-include(VERSION.cmake)
-
 ## declare project-wide user flags, and set default values
 
 # options that can be switched off to simplify the build and reduce its scope

VERSION.cmake

-set(BornAgain_VERSION_MAJOR 1)
-set(BornAgain_VERSION_MINOR 17)
-set(BornAgain_VERSION_PATCH 99)

cmake/modules/BornAgainCPack.cmake

@@ -3,13 +3,6 @@
 include(InstallRequiredSystemLibraries)
 
 set(CPACK_PACKAGE_VENDOR "Forschungszentrum Juelich GmbH")
-set(BORNAGAIN_VERSION
-    "${BORNAGAIN_VERSION_MAJOR}.${BORNAGAIN_VERSION_MINOR}.${BORNAGAIN_VERSION_PATCH}")
-
-set(CPACK_PACKAGE_VERSION_MAJOR ${BornAgain_VERSION_MAJOR})
-set(CPACK_PACKAGE_VERSION_MINOR ${BornAgain_VERSION_MINOR})
-set(CPACK_PACKAGE_VERSION_PATCH ${BornAgain_VERSION_PATCH})
-set(CPACK_PACKAGE_VERSION ${BORNAGAIN_VERSION})
 
 configure_file(COPYING LICENSE.txt COPYONLY)
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_BINARY_DIR}/LICENSE.txt")
@@ -18,7 +11,7 @@ set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_BINARY_DIR}/LICENSE.txt")
 set(CPACK_PACKAGE_RELOCATABLE True)
 
 set(CPACK_PACKAGE_FILE_NAME
-    "${CMAKE_PROJECT_NAME}-${BORNAGAIN_VERSION}-${BORNAGAIN_ARCHITECTURE}")
+    "${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION}-${BORNAGAIN_ARCHITECTURE}")
 if(NOT CMAKE_BUILD_TYPE STREQUAL Release)
     string(APPEND CPACK_PACKAGE_FILE_NAME "-${CMAKE_BUILD_TYPE}")
 endif()
@@ -39,7 +32,7 @@ endif()
 
 # Generating the source package
 set(CPACK_SOURCE_GENERATOR "TGZ")
-set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${BORNAGAIN_VERSION}")
+set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION}")
 
 message(STATUS "Installer name: ${CPACK_PACKAGE_FILE_NAME}")
 message(STATUS "Source package name: ${CPACK_SOURCE_PACKAGE_FILE_NAME}")

cmake/modules/CPackApple.cmake

-# BornAgain Mac packaging 
+# BornAgain Mac packaging
 
 set(SELECTED_PYTHON_VERSION "python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}")
 
 set(CPACK_PACKAGE_FILE_NAME
-    "${CMAKE_PROJECT_NAME}-${BORNAGAIN_VERSION}-${SELECTED_PYTHON_VERSION}-${BORNAGAIN_ARCHITECTURE}-10.13+")
+    "${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION}-${SELECTED_PYTHON_VERSION}-${BORNAGAIN_ARCHITECTURE}-10.13+")
 
 set(CPACK_BINARY_DRAGNDROP ON)
 set(CPACK_GENERATOR "DragNDrop")
-
-

cmake/modules/CPackDebian.cmake

@@ -34,7 +34,7 @@ set(CPACK_DEBIAN_PACKAGE_DEPENDS "libgsl-dev(>=1.15), libboost-all-dev, libfftw3
 set(CPACK_DEBIAN_PACKAGE_DESCRIPTION ${CMAKE_PROJECT_DESCRIPTION})
 set(CPACK_DEBIAN_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${BornAgain_VERSION_PATCH})
 set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_DEBIAN_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
-set(CPACK_DEBIAN_PACKAGE_CONFLICTS "${CMAKE_PROJECT_NAME}(<=${BORNAGAIN_VERSION})")
+set(CPACK_DEBIAN_PACKAGE_CONFLICTS "${CMAKE_PROJECT_NAME}(<=${CMAKE_PROJECT_VERSION})")
 
 # set postinstall and preremove scripts for the debian package
 set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${BUILD_VAR_DIR}/postinst;${BUILD_VAR_DIR}/prerm;")

cmake/modules/CPackWindows.cmake

@@ -3,7 +3,7 @@
 set(SELECTED_PYTHON_VERSION "python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}")
 
 set(CPACK_PACKAGE_FILE_NAME
-    "${CMAKE_PROJECT_NAME}-${BORNAGAIN_VERSION}-${SELECTED_PYTHON_VERSION}-${BORNAGAIN_ARCHITECTURE}")
+    "${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION}-${SELECTED_PYTHON_VERSION}-${BORNAGAIN_ARCHITECTURE}")
 
 set(CPACK_GENERATOR "NSIS")
 
@@ -40,4 +40,3 @@ set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
   RMDir /r \\\"$INSTDIR\\\\python\\\"
   Delete \\\"$DESKTOP\\\\BornAgain.lnk\\\"
 ")
-