From b6b781dc26660c327fad3ec18be586751b953c4f Mon Sep 17 00:00:00 2001 From: James Mitchell Date: Wed, 25 Mar 2026 13:24:04 +0000 Subject: [PATCH 1/2] Update CMakeLists.txt for package_sources --- .gitignore | 8 ++++++++ CMakeLists.txt | 32 +++++++++++++++++++++++--------- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 05cdd11f..9aa4bb4d 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,14 @@ # Python byte code files *.pyc +# Mac OS files +.DS_Store + +# Generated files +HPCOMBI_VERSION +hpcombi.pc + TAGS build* gh-pages + diff --git a/CMakeLists.txt b/CMakeLists.txt index 74813445..f546561e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 @@ -168,16 +175,23 @@ install ( ################# # Packing stuff # -set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${DESCRIPTION}") -set(CPACK_PACKAGE_VENDOR "Florent Hivert ") -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 ") +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) ######################## From cfbcf2d5e29ad35079ea0c4df9e4bc0b4f6d741b Mon Sep 17 00:00:00 2001 From: James Mitchell Date: Wed, 25 Mar 2026 12:28:07 +0000 Subject: [PATCH 2/2] Update version numbers etc for v1.1.2 --- CMakeLists.txt | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f546561e..23727abd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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}") diff --git a/README.md b/README.md index 3a80aa46..d062404e 100644 --- a/README.md +++ b/README.md @@ -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