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 Sep 9, 2024
2 parents 62df6b7 + 6e48818 commit 0c4096a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 10 deletions.
5 changes: 1 addition & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@
# ##############################################################################

cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
cmake_policy(VERSION 3.20)
if(POLICY CMP0144)
cmake_policy(SET CMP0144 NEW)
endif()
cmake_policy(VERSION ${CMAKE_VERSION})

# ############
# Define Project
Expand Down
8 changes: 4 additions & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ for (int i = 0; i < dockerPlatforms.size(); i++) {

/****************** osx builds (on host) */
def osxPlatforms = [
["gcc", ['CC=gcc-13', 'CXX=g++-13', 'FC=gfortran-13']],
["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']]
["gcc", ['CC=gcc-14', 'CXX=g++-14', 'FC=gfortran-14']],
["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']]
]
for (int i = 0; i < osxPlatforms.size(); i++) {
def platformEnv = osxPlatforms[i]
Expand Down Expand Up @@ -88,8 +88,8 @@ for (int i = 0; i < osxPlatforms.size(); i++) {
"C_INCLUDE_PATH=$hdf5/include:${env.BREW}/include",
"CPLUS_INCLUDE_PATH=$venv/include:$hdf5/include:${env.BREW}/include",
"LIBRARY_PATH=$venv/lib:$hdf5/lib:${env.BREW}/lib",
"LD_LIBRARY_PATH=$hdf5/lib",
"PYTHONPATH=$installDir/lib/python3.9/site-packages",
"DYLD_LIBRARY_PATH=$venv/lib:$hdf5/lib:${env.BREW}/lib",
"PYTHONPATH=$installDir/lib/python3.12/site-packages",
"CMAKE_PREFIX_PATH=$venv/lib/cmake/triqs",
"OMP_NUM_THREADS=2",
"BLAS_ROOT=$openblas",
Expand Down
4 changes: 2 additions & 2 deletions deps/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ endif()
if(PythonSupport OR (NOT IS_SUBPROJECT AND Build_Documentation))
external_dependency(Cpp2Py
GIT_REPO https://github.com/TRIQS/cpp2py
VERSION 2.0
GIT_TAG unstable
VERSION 3.3
GIT_TAG main
BUILD_ALWAYS
EXCLUDE_FROM_ALL
)
Expand Down

0 comments on commit 0c4096a

Please sign in to comment.