Skip to content

Commit 8ee5f84

Browse files
committed
Merge remote-tracking branch 'app4triqs-remote/unstable' into main
# Conflicts: # .github/workflows/build.yml # CMakeLists.txt # Dockerfile # Jenkinsfile # c++/app4triqs/app4triqs.cpp # c++/app4triqs/app4triqs.hpp # deps/CMakeLists.txt # doc/documentation.rst # doc/index.rst # packaging/TRIQS-app4triqs-foss-2021b.eb.in # python/app4triqs/CMakeLists.txt # test/python/Basic.py # test/python/CMakeLists.txt
2 parents e003016 + 6207cb5 commit 8ee5f84

13 files changed

Lines changed: 14 additions & 524 deletions

.gitattributes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
*.cxx linguist-generated
2+
*.hxx linguist-generated
3+
*.h5 linguist-generated
4+
*.dat linguist-generated

CMakeLists.txt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#
2020
# ##############################################################################
2121

22-
cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
22+
cmake_minimum_required(VERSION 3.22 FATAL_ERROR)
2323
cmake_policy(VERSION ${CMAKE_VERSION})
2424

2525
# ############
@@ -81,6 +81,11 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
8181
# Disable compiler extensions
8282
set(CMAKE_CXX_EXTENSIONS OFF)
8383

84+
# No C++20 modules used. Disable module scanning (default ON for C++20+ with Ninja):
85+
# it injects transient @<obj>.modmap flags into compile_commands.json that break clair-c2py
86+
# binding generation when it replays those commands. No-op on CMake < 3.28.
87+
set(CMAKE_CXX_SCAN_FOR_MODULES OFF)
88+
8489
# Provide additional debugging information for Debug builds
8590
add_compile_options($<$<CONFIG:Debug>:-ggdb3>)
8691

@@ -102,8 +107,9 @@ target_compile_options(${PROJECT_NAME}_warnings
102107
$<$<CXX_COMPILER_ID:AppleClang,Clang,IntelLLVM>:-Wno-unknown-warning-option>
103108
$<$<CXX_COMPILER_ID:AppleClang,Clang,IntelLLVM>:-Wshadow>
104109
$<$<CXX_COMPILER_ID:AppleClang,Clang,IntelLLVM>:-Wno-gcc-compat>
105-
$<$<CXX_COMPILER_ID:AppleClang,Clang,IntelLLVM>:-Wno-c++20-extensions>
106-
$<$<CXX_COMPILER_ID:AppleClang,Clang,IntelLLVM>:-Wno-c++20-compat>
110+
$<$<CXX_COMPILER_ID:AppleClang,Clang,IntelLLVM>:-Wno-c++26-extensions>
111+
$<$<CXX_COMPILER_ID:AppleClang,Clang,IntelLLVM>:-Wno-c++26-compat>
112+
$<$<CXX_COMPILER_ID:AppleClang,Clang,IntelLLVM>:-Wno-c2y-extensions> # __COUNTER__ in SCOPE_EXIT
107113
$<$<CXX_COMPILER_ID:IntelLLVM>:-Wno-tautological-constant-compare>
108114
)
109115

doc/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
imaginary time single-particle Green's functions and other imaginary time
88
quantities, including standard operations. It can be downloaded `from GitHub <https://github.com/flatironinstitute/cppdlr>`_.
99

10-
The DLR has been implemented in other programming languages (see the :ref:`related libraries<otherlibraries>` below).
10+
The DLR has been implemented in other programming languages (see the :ref:`related libraries<otherlibraries>` below).
1111
``cppdlr`` offers a particularly simple high-level user interface, enabled by
1212
the use of C++ templating and the `nda library <https://github.com/TRIQS/nda>`_ for array types and BLAS/LAPACK
1313
compatibility. This facilitates its use both in small-scale applications and in

doc/themes/triqs/layout.html

Lines changed: 0 additions & 52 deletions
This file was deleted.

doc/themes/triqs/static/bodybg.png

-602 Bytes
Binary file not shown.

doc/themes/triqs/static/cufon-yui.js

Lines changed: 0 additions & 7 deletions
This file was deleted.
-313 Bytes
Binary file not shown.
-344 Bytes
Binary file not shown.
-207 Bytes
Binary file not shown.

doc/themes/triqs/static/relbg.png

-332 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)