Skip to content

Commit 672e4c1

Browse files
committed
Merge remote-tracking branch 'app4triqs-remote/unstable' into unstable
2 parents b329db0 + 6e48818 commit 672e4c1

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
2-
cmake_policy(VERSION 3.20)
3-
if(POLICY CMP0144)
4-
cmake_policy(SET CMP0144 NEW)
5-
endif()
2+
cmake_policy(VERSION ${CMAKE_VERSION})
63

74
# ############
85
# Define Project

Jenkinsfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ for (int i = 0; i < dockerPlatforms.size(); i++) {
5858

5959
/****************** osx builds (on host) */
6060
def osxPlatforms = [
61-
["gcc", ['CC=gcc-13', 'CXX=g++-13', 'FC=gfortran-13']],
62-
["clang", ['CC=$BREW/opt/llvm/bin/clang', 'CXX=$BREW/opt/llvm/bin/clang++', 'FC=gfortran-13', 'CXXFLAGS=-I$BREW/opt/llvm/include', 'LDFLAGS=-L$BREW/opt/llvm/lib']]
61+
["gcc", ['CC=gcc-14', 'CXX=g++-14', 'FC=gfortran-14']],
62+
["clang", ['CC=$BREW/opt/llvm/bin/clang', 'CXX=$BREW/opt/llvm/bin/clang++', 'FC=gfortran-14', 'CXXFLAGS=-I$BREW/opt/llvm/include', 'LDFLAGS=-L$BREW/opt/llvm/lib']]
6363
]
6464
for (int i = 0; i < osxPlatforms.size(); i++) {
6565
def platformEnv = osxPlatforms[i]
@@ -86,8 +86,8 @@ for (int i = 0; i < osxPlatforms.size(); i++) {
8686
"C_INCLUDE_PATH=$hdf5/include:${env.BREW}/include",
8787
"CPLUS_INCLUDE_PATH=$venv/include:$hdf5/include:${env.BREW}/include",
8888
"LIBRARY_PATH=$venv/lib:$hdf5/lib:${env.BREW}/lib",
89-
"LD_LIBRARY_PATH=$hdf5/lib",
90-
"PYTHONPATH=$installDir/lib/python3.9/site-packages",
89+
"DYLD_LIBRARY_PATH=$venv/lib:$hdf5/lib:${env.BREW}/lib",
90+
"PYTHONPATH=$installDir/lib/python3.12/site-packages",
9191
"CMAKE_PREFIX_PATH=$venv/lib/cmake/triqs",
9292
"VIRTUAL_ENV=$venv",
9393
"OMP_NUM_THREADS=2"]) {

deps/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ endif()
5151
if(PythonSupport OR (NOT IS_SUBPROJECT AND Build_Documentation))
5252
external_dependency(Cpp2Py
5353
GIT_REPO https://github.com/TRIQS/cpp2py
54-
VERSION 2.0
55-
GIT_TAG unstable
54+
VERSION 3.3
55+
GIT_TAG main
5656
BUILD_ALWAYS
5757
EXCLUDE_FROM_ALL
5858
)

0 commit comments

Comments
 (0)