Skip to content

Commit

Permalink
Merge remote-tracking branch 'app4triqs-remote/unstable' into unstable
Browse files Browse the repository at this point in the history
  • Loading branch information
Wentzell committed May 15, 2024
2 parents dbc5eb3 + f0f0789 commit f33b727
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions/cache/restore@v3
- uses: actions/cache/restore@v4
with:
path: ${{ env.CCACHE_DIR }}
key: ccache-${{ matrix.os }}-${{ matrix.cc }}-${{ github.run_id }}
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
if: always()
run: ccache -sv

- uses: actions/cache/save@v3
- uses: actions/cache/save@v4
if: always()
with:
path: ${{ env.CCACHE_DIR }}
Expand Down
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ endif()

# ############
# Define Project
project(triqs_maxent VERSION 3.2.0 LANGUAGES C CXX)
project(triqs_maxent VERSION 3.3.0 LANGUAGES C CXX)
get_directory_property(IS_SUBPROJECT PARENT_DIRECTORY)

# ############
# Load TRIQS and CPP2PY
find_package(TRIQS 3.2 REQUIRED)
find_package(TRIQS 3.3 REQUIRED)

# Get the git hash & print status
triqs_get_git_hash_of_source_dir(PROJECT_GIT_HASH)
Expand Down Expand Up @@ -127,7 +127,7 @@ if(BUILD_DEBIAN_PACKAGE AND NOT IS_SUBPROJECT)
set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
set(CPACK_PACKAGE_CONTACT "https://github.com/TRIQS/${PROJECT_NAME}")
execute_process(COMMAND dpkg --print-architecture OUTPUT_VARIABLE CMAKE_DEBIAN_PACKAGE_ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE)
set(CPACK_DEBIAN_PACKAGE_DEPENDS "triqs (>= 3.2)")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "triqs (>= 3.3)")
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS ON)
include(CPack)
Expand Down
2 changes: 1 addition & 1 deletion packaging/TRIQS-triqs_maxent-foss-2021b.eb.in
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dependencies = [
('GMP', '6.2.1'),
('HDF5', '1.10.7'),
('Mako', '1.1.4'),
('TRIQS', '3.2.0'),
('TRIQS', '3.3.0'),
('NFFT', '3.5.2')
]

Expand Down

0 comments on commit f33b727

Please sign in to comment.