From 3f9cb034e2668f20e8bdcc783f2b13ff2b1649dd Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 8 Jul 2020 12:49:15 +0200
Subject: [PATCH] CMake: set VERSION in project command in top-level
CMakeLists.cmake
---
CMakeLists.txt | 3 +--
VERSION.cmake | 3 ---
cmake/modules/BornAgainCPack.cmake | 11 ++---------
cmake/modules/CPackApple.cmake | 6 ++----
cmake/modules/CPackDebian.cmake | 2 +-
cmake/modules/CPackWindows.cmake | 3 +--
6 files changed, 7 insertions(+), 21 deletions(-)
delete mode 100644 VERSION.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e7b58939ff6..69181f68c96 100644
--- a/CMakeLists.txt
+++ b/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
diff --git a/VERSION.cmake b/VERSION.cmake
deleted file mode 100644
index a905d19e173..00000000000
--- a/VERSION.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(BornAgain_VERSION_MAJOR 1)
-set(BornAgain_VERSION_MINOR 17)
-set(BornAgain_VERSION_PATCH 99)
diff --git a/cmake/modules/BornAgainCPack.cmake b/cmake/modules/BornAgainCPack.cmake
index b524f4e927f..01f0d6d767d 100644
--- a/cmake/modules/BornAgainCPack.cmake
+++ b/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}")
diff --git a/cmake/modules/CPackApple.cmake b/cmake/modules/CPackApple.cmake
index c7c8dee864c..7e63bc236da 100644
--- a/cmake/modules/CPackApple.cmake
+++ b/cmake/modules/CPackApple.cmake
@@ -1,11 +1,9 @@
-# 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")
-
-
diff --git a/cmake/modules/CPackDebian.cmake b/cmake/modules/CPackDebian.cmake
index 6824fda0b43..279b5343cfc 100644
--- a/cmake/modules/CPackDebian.cmake
+++ b/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;")
diff --git a/cmake/modules/CPackWindows.cmake b/cmake/modules/CPackWindows.cmake
index 880476ea856..79357961620 100644
--- a/cmake/modules/CPackWindows.cmake
+++ b/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\\\"
")
-
--
GitLab