mirror of
https://github.com/triqs/dft_tools
synced 2024-10-31 03:03:48 +01:00
Merge remote-tracking branch 'app4triqs-remote/unstable' into unstable
This commit is contained in:
commit
b002037ac4
@ -20,10 +20,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
|
||||
|
8
Jenkinsfile
vendored
8
Jenkinsfile
vendored
@ -58,8 +58,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]
|
||||
@ -86,8 +86,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",
|
||||
"VIRTUAL_ENV=$venv",
|
||||
"OMP_NUM_THREADS=2"]) {
|
||||
|
4
deps/CMakeLists.txt
vendored
4
deps/CMakeLists.txt
vendored
@ -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
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user