Skip to content

Release candidate for 1.1.2 #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
james-d-mitchell merged 2 commits into from
Mar 25, 2026
Merged

Release candidate for 1.1.2 #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6b781d
Update CMakeLists.txt for package_sources
james-d-mitchell Mar 25, 2026
cfbcf2d
Update version numbers etc for v1.1.2
james-d-mitchell Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@
# Python byte code files
*.pyc

# Mac OS files
.DS_Store

# Generated files
HPCOMBI_VERSION
hpcombi.pc

TAGS
build*
gh-pages

34 changes: 24 additions & 10 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ set(DESCRIPTION "High Performance Combinatorics in C++ using vector instruction
CACHE STRING "Project description.")
set(VERSION_MAJOR 1 CACHE STRING "Project major version number.")
set(VERSION_MINOR 1 CACHE STRING "Project minor version number.")
set(VERSION_PATCH 1 CACHE STRING "Project patch version number.")
set(VERSION_PATCH 2 CACHE STRING "Project patch version number.")
mark_as_advanced(VERSION_MAJOR VERSION_MINOR VERSION_PATCH)

message(STATUS "**** Build type = ${CMAKE_BUILD_TYPE}")
Expand Down Expand Up @@ -141,6 +141,13 @@ configure_file(${CMAKE_SOURCE_DIR}/HPCOMBI_VERSION.in
configure_file(${CMAKE_SOURCE_DIR}/hpcombi.pc.in
${CMAKE_CURRENT_BINARY_DIR}/hpcombi.pc @ONLY)

# The next lines are included so that the files HPCOMBI_VERSION and hpcombi.pc
# are included in the archive generated by "make package_source"
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/HPCOMBI_VERSION.in
${CMAKE_CURRENT_SOURCE_DIR}/HPCOMBI_VERSION)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/hpcombi.pc.in
${CMAKE_CURRENT_SOURCE_DIR}/hpcombi.pc @ONLY)

####################
# Installation

Expand Down Expand Up @@ -168,16 +175,23 @@ install (
#################
# Packing stuff
#
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${DESCRIPTION}")
set(CPACK_PACKAGE_VENDOR "Florent Hivert <florent.hivert@lri.fr>")
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}")

set(CPACK_GENERATOR "TGZ")
SET(CPACK_PACKAGE_FILE_NAME
set(CPACK_SOURCE_PACKAGE_DESCRIPTION_SUMMARY "${DESCRIPTION}")
set(CPACK_SOURCE_PACKAGE_VENDOR "Florent Hivert <florent.hivert@lri.fr>")
set(CPACK_SOURCE_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
set(CPACK_SOURCE_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
set(CPACK_SOURCE_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
set(CPACK_SOURCE_PACKAGE_VERSION_PATCH "${VERSION_PATCH}")

SET(CPACK_SOURCE_PACKAGE_FILE_NAME
"HPCombi-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
set(CPACK_SOURCE_IGNORE_FILES
".circleci"
"/\\.git/"
"/build/"
"/doc.html"
"/experiments/"
"/gh-pages/"
)
include(CPack)

########################
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# HPCombi

High Performance Combinatorics in C++ using vector instructions v1.1.1
High Performance Combinatorics in C++ using vector instructions v1.1.2

HPCombi is a C++17 header-only library using the SSE and AVX instruction sets,
and some equivalents, for very fast manipulation of small combinatorial objects
Expand Down
Loading