diff --git a/CMakeLists.txt b/CMakeLists.txt index 3292cdf8..a5d9bd95 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,20 +19,17 @@ # # ############################################################################## -cmake_minimum_required(VERSION 3.12.4 FATAL_ERROR) -cmake_policy(VERSION 3.12.4) -if(POLICY CMP0077) - cmake_policy(SET CMP0077 NEW) -endif() +cmake_minimum_required(VERSION 3.20 FATAL_ERROR) +cmake_policy(VERSION 3.20) # ############ # 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) # ############ # Load TRIQS and CPP2PY -find_package(TRIQS 3.1 REQUIRED) +find_package(TRIQS 3.2 REQUIRED) # Get the git hash & print status 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_CONTACT "https://github.com/TRIQS/${PROJECT_NAME}") 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_GENERATE_SHLIBS ON) include(CPack) diff --git a/Jenkinsfile b/Jenkinsfile index 6b9abc9b..75ac9959 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -93,7 +93,7 @@ for (int i = 0; i < osxPlatforms.size(); i++) { deleteDir() /* 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 "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" catchError(buildResult: 'UNSTABLE', stageResult: 'UNSTABLE') { try { sh "make test CTEST_OUTPUT_ON_FAILURE=1"