Skip to content

Commit 808ad6f

Browse files
committed
Merge remote-tracking branch 'app4triqs-remote/unstable' into unstable
# Conflicts: # .github/workflows/build.yml # CMakeLists.txt # README.md # doc/conf.py.in # doc/doxygen/Doxyfile.in
2 parents 073d472 + 2d0a713 commit 808ad6f

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ jobs:
2828
include:
2929
- { os: ubuntu-24.04, cc: clang-20, cxx: clang++-20 }
3030
- { os: ubuntu-24.04, cc: gcc-14, cxx: g++-14 }
31-
- { os: macos-15, cc: clang, cxx: clang++ }
32-
- { os: macos-15, cc: gcc-16, cxx: g++-16 }
31+
- { os: macos-26, cc: clang, cxx: clang++ }
32+
- { os: macos-26, cc: gcc-16, cxx: g++-16 }
3333

3434
runs-on: ${{ matrix.os }}
3535

CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ project(triqs_dft_tools VERSION 4.0.0 LANGUAGES CXX)
2828
get_directory_property(IS_SUBPROJECT PARENT_DIRECTORY)
2929

3030
# version displayed in the documentation
31-
set(BRANCH_FOR_DOC ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.x)
31+
set(BRANCH_FOR_DOC unstable)
3232

3333
# ############
3434
# Load TRIQS
@@ -83,6 +83,9 @@ if(Build_Tests)
8383
enable_testing()
8484
endif()
8585

86+
# Build a Debian package
87+
option(BUILD_DEBIAN_PACKAGE "Build a deb package" OFF)
88+
8689
# Provide GNU Installation directories
8790
include(GNUInstallDirs)
8891

@@ -117,7 +120,6 @@ add_subdirectory(packaging)
117120
# #############
118121
# Debian Package
119122

120-
option(BUILD_DEBIAN_PACKAGE "Build a deb package" OFF)
121123
if(BUILD_DEBIAN_PACKAGE AND NOT IS_SUBPROJECT)
122124
if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
123125
message(FATAL_ERROR "CMAKE_INSTALL_PREFIX must be /usr for packaging")

0 commit comments

Comments
 (0)