Skip to content

Commit

Permalink
Merge develop into feature-newer-mpi-types
Browse files Browse the repository at this point in the history
  • Loading branch information
tim-griesbach committed Dec 13, 2024
2 parents cf9ab90 + 53eaa69 commit 8974506
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 4 deletions.
27 changes: 23 additions & 4 deletions cmake/install.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,35 @@ NAMESPACE ${PROJECT_NAME}::
)

# --- CPack
set(CPACK_GENERATOR "TBZ2")
set(CPACK_SOURCE_GENERATOR "TBZ2")
if(WIN32)
set(CPACK_GENERATOR "ZIP")
set(CPACK_SOURCE_GENERATOR "ZIP")
else()
set(CPACK_GENERATOR "TGZ")
set(CPACK_SOURCE_GENERATOR "TGZ")
endif()
set(CPACK_PACKAGE_VENDOR "Carsten Burstedde")
set(CPACK_PACKAGE_CONTACT "Carsten Burstedde")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README")
set(CPACK_PACKAGE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/package)
string(TOLOWER ${CMAKE_SYSTEM_NAME} _sys)
set(CPACK_PACKAGE_FILE_NAME "libsc-${git_version}-${_sys}")
set(CPACK_SOURCE_PACKAGE_FILE_NAME "libsc-${git_version}")
string(TOLOWER ${PROJECT_NAME} _project_lower)

# Define a variable for the version file
set(VERSION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/.tarball-version")

# Generate .tarball-version file
add_custom_command(
OUTPUT ${VERSION_FILE}
COMMAND ${CMAKE_COMMAND} -E echo "${PROJECT_VERSION}" > ${VERSION_FILE}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
)

add_custom_target(${PROJECT_NAME}_VersionFile ALL DEPENDS ${VERSION_FILE})

set(CPACK_PACKAGE_FILE_NAME "${_project_lower}-${PROJECT_VERSION}-${_sys}")
set(CPACK_SOURCE_PACKAGE_FILE_NAME "${_project_lower}-${PROJECT_VERSION}")

# not .gitignore as its regex syntax is more advanced than CMake
set(CPACK_SOURCE_IGNORE_FILES .git/ .github/ .vscode/ _CPack_Packages/
Expand Down
1 change: 1 addition & 0 deletions doc/release_notes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
- Adapt CMake CI to matrix of latest compilers
- Check for MPI_Aint_diff in CMake and Autoconf
- Check if MPI_UNSIGNED_LONG_LONG, MPI_SIGNED_CHAR and MPI_INT8_T are available
- Fix tarball naming and add a CMake target to generate .tarball-version file

## 2.8.6

Expand Down

0 comments on commit 8974506

Please sign in to comment.