LCPQ/dft_tools
3
0
Fork 0
mirror of https://github.com/triqs/dft_tools synced 2024-12-22 20:34:38 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'app4triqs-remote/unstable' into unstable

Browse Source
This commit is contained in:
Nils Wentzell 2023-06-22 15:16:35 -04:00
commit edf91a9819
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -19,20 +19,17 @@
# #
# ############################################################################## # ##############################################################################
cmake_minimum_required(VERSION 3.12.4 FATAL_ERROR) cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
cmake_policy(VERSION 3.12.4) cmake_policy(VERSION 3.20)
if(POLICY CMP0077)
cmake_policy(SET CMP0077 NEW)
endif()
# ############ # ############
# Define Project # Define Project
project(triqs_dft_tools VERSION 3.1.0 LANGUAGES C CXX Fortran) project(triqs_dft_tools VERSION 3.2.0 LANGUAGES C CXX Fortran)
get_directory_property(IS_SUBPROJECT PARENT_DIRECTORY) get_directory_property(IS_SUBPROJECT PARENT_DIRECTORY)
# ############ # ############
# Load TRIQS and CPP2PY # Load TRIQS and CPP2PY
find_package(TRIQS 3.1 REQUIRED) find_package(TRIQS 3.2 REQUIRED)
# Get the git hash & print status # Get the git hash & print status
triqs_get_git_hash_of_source_dir(PROJECT_GIT_HASH) triqs_get_git_hash_of_source_dir(PROJECT_GIT_HASH)
@ -174,7 +171,7 @@ if(BUILD_DEBIAN_PACKAGE AND NOT IS_SUBPROJECT)
set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
set(CPACK_PACKAGE_CONTACT "https://github.com/TRIQS/${PROJECT_NAME}") set(CPACK_PACKAGE_CONTACT "https://github.com/TRIQS/${PROJECT_NAME}")
execute_process(COMMAND dpkg --print-architecture OUTPUT_VARIABLE CMAKE_DEBIAN_PACKAGE_ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND dpkg --print-architecture OUTPUT_VARIABLE CMAKE_DEBIAN_PACKAGE_ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE)
set(CPACK_DEBIAN_PACKAGE_DEPENDS "triqs (>= 3.1)") set(CPACK_DEBIAN_PACKAGE_DEPENDS "triqs (>= 3.2)")
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS ON) set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS ON)
include(CPack) include(CPack)

2
Jenkinsfile vendored
View File

@ -93,7 +93,7 @@ for (int i = 0; i < osxPlatforms.size(); i++) {
deleteDir() deleteDir()
/* note: this is installing into the parent (triqs) venv (install dir), which is thus shared among apps and so not be completely safe */ /* note: this is installing into the parent (triqs) venv (install dir), which is thus shared among apps and so not be completely safe */
sh "pip3 install -U -r $srcDir/requirements.txt" sh "pip3 install -U -r $srcDir/requirements.txt"
sh "cmake $srcDir -DCMAKE_INSTALL_PREFIX=$installDir -DTRIQS_ROOT=$triqsDir -DBuild_Deps=Always" sh "cmake $srcDir -DCMAKE_INSTALL_PREFIX=$installDir -DTRIQS_ROOT=$triqsDir"
sh "make -j2 || make -j1 VERBOSE=1" sh "make -j2 || make -j1 VERBOSE=1"
catchError(buildResult: 'UNSTABLE', stageResult: 'UNSTABLE') { try { catchError(buildResult: 'UNSTABLE', stageResult: 'UNSTABLE') { try {
sh "make test CTEST_OUTPUT_ON_FAILURE=1" sh "make test CTEST_OUTPUT_ON_FAILURE=1"