diff --git a/scripts/cmake/packaging/Pack.cmake b/scripts/cmake/packaging/Pack.cmake index 22ee450538280279089174d8bf56cf298f183b07..2bfc4f003421e9a97d4e40201777241317ebbaf5 100644 --- a/scripts/cmake/packaging/Pack.cmake +++ b/scripts/cmake/packaging/Pack.cmake @@ -4,14 +4,11 @@ include(packaging/ArchiveTestdata) #### Packaging setup #### set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "OGS-6 THM/C Simulator") set(CPACK_PACKAGE_VENDOR "OpenGeoSys Community (http://www.opengeosys.org)") -set(CPACK_PACKAGE_INSTALL_DIRECTORY "OGS-${OGS_VERSION_MAJOR}.${OGS_VERSION_MINOR}.${OGS_VERSION_PATCH}") +set(CPACK_PACKAGE_INSTALL_DIRECTORY "OGS-${OGS_VERSION}") set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md") set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.txt") set(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.md") # set(CPACK_RESOURCE_FILE_WELCOME "${CMAKE_SOURCE_DIR}/README.md") -set(CPACK_PACKAGE_VERSION_MAJOR "${OGS_VERSION_MAJOR}") -set(CPACK_PACKAGE_VERSION_MINOR "${OGS_VERSION_MINOR}") -set(CPACK_PACKAGE_VERSION_PATCH "${OGS_VERSION_PATCH}") if(APPLE) set(CPACK_PACKAGE_FILE_NAME "ogs-${GIT_DESCRIBE}-OSX-${OSX_VERSION}-x${BITS}") set(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}) @@ -19,8 +16,6 @@ else() set(CPACK_PACKAGE_FILE_NAME "ogs-${GIT_DESCRIBE}-${CMAKE_SYSTEM}-x${BITS}") endif() -#set(CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE 1) - if (WIN32) include (packaging/PackagingWin) endif()