Skip to content

Commit a0dc668

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 a08169d + 2d0a713 commit a0dc668

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ project(solid_dmft 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
@@ -94,6 +94,9 @@ if(Build_Tests)
9494
endif()
9595
endif()
9696

97+
# Build a Debian package
98+
option(BUILD_DEBIAN_PACKAGE "Build a deb package" OFF)
99+
97100
# Provide GNU Installation directories
98101
include(GNUInstallDirs)
99102

@@ -128,7 +131,6 @@ add_subdirectory(packaging)
128131
# #############
129132
# Debian Package
130133

131-
option(BUILD_DEBIAN_PACKAGE "Build a deb package" OFF)
132134
if(BUILD_DEBIAN_PACKAGE AND NOT IS_SUBPROJECT)
133135
if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
134136
message(FATAL_ERROR "CMAKE_INSTALL_PREFIX must be /usr for packaging")

0 commit comments

Comments
 (0)