From 14d30a1a146216089e2579257239c4f6ddc16a6c Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Wed, 9 Sep 2020 12:03:55 -0400 Subject: [PATCH 1/4] [cmake] Do not warn about unkown warning options --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index b9d9039a..a1de3058 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,6 +104,7 @@ target_compile_options(${PROJECT_NAME}_warnings -Wpedantic -Wno-sign-compare -Wno-deprecated-comma-subscript + -Wno-unknown-warning-option $<$:-Wshadow=local> $<$:-Wno-attributes> $<$:-Wshadow> From 5dbd12f165e05972dfc594e1d8379299fb5b2703 Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Wed, 9 Sep 2020 15:51:00 -0400 Subject: [PATCH 2/4] [cmake] Use FindGit.cmake in external_dependency.cmake, Improve error message on clone failure --- deps/external_dependency.cmake | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/deps/external_dependency.cmake b/deps/external_dependency.cmake index 19dd26dc..252cead8 100644 --- a/deps/external_dependency.cmake +++ b/deps/external_dependency.cmake @@ -72,9 +72,18 @@ function(external_dependency) set(src_dir ${bin_dir}_src) if(NOT IS_DIRECTORY ${src_dir}) if(ARG_GIT_TAG) - set(clone_opts --branch ${ARG_GIT_TAG} -c advice.detachedHead=false) + set(clone_opts --branch ${ARG_GIT_TAG} -c advice.detachedHead=false) + endif() + if(NOT GIT_EXECUTABLE) + find_package(Git REQUIRED) + endif() + execute_process(COMMAND ${GIT_EXECUTABLE} clone ${ARG_GIT_REPO} --depth 1 ${clone_opts} ${src_dir} + RESULT_VARIABLE clone_failed + ERROR_VARIABLE clone_error + ) + if(clone_failed) + message(FATAL_ERROR "Failed to clone sources for dependency ${ARGV0}.\n ${clone_error}") endif() - execute_process(COMMAND git clone ${ARG_GIT_REPO} --depth 1 ${clone_opts} ${src_dir}) endif() add_subdirectory(${src_dir} ${bin_dir} ${subdir_opts}) else() From 87637f8d6885223eb10e9310c6229c665fddb4b7 Mon Sep 17 00:00:00 2001 From: Dylan Simon Date: Wed, 9 Sep 2020 19:03:28 -0400 Subject: [PATCH 3/4] [jenkins] switch to gcc-10 on osx --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index bab8d5a6..cd79953d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -53,8 +53,8 @@ for (int i = 0; i < dockerPlatforms.size(); i++) { /****************** osx builds (on host) */ def osxPlatforms = [ - ["gcc", ['CC=gcc-9', 'CXX=g++-9', 'FC=gfortran-9']], - ["clang", ['CC=$BREW/opt/llvm/bin/clang', 'CXX=$BREW/opt/llvm/bin/clang++', 'FC=gfortran-9', 'CXXFLAGS=-I$BREW/opt/llvm/include', 'LDFLAGS=-L$BREW/opt/llvm/lib']] + ["gcc", ['CC=gcc-10', 'CXX=g++-10', 'FC=gfortran-10']], + ["clang", ['CC=$BREW/opt/llvm/bin/clang', 'CXX=$BREW/opt/llvm/bin/clang++', 'FC=gfortran-10', 'CXXFLAGS=-I$BREW/opt/llvm/include', 'LDFLAGS=-L$BREW/opt/llvm/lib']] ] for (int i = 0; i < osxPlatforms.size(); i++) { def platformEnv = osxPlatforms[i] From 7c8d2ff37d9a93a818c8b82c0fd24f7937bae5a0 Mon Sep 17 00:00:00 2001 From: Dylan Simon Date: Wed, 9 Sep 2020 19:32:24 -0400 Subject: [PATCH 4/4] [jenkins] update osx to python3.8 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index cd79953d..2db0c0ed 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -82,7 +82,7 @@ for (int i = 0; i < osxPlatforms.size(); i++) { "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.7/site-packages", + "PYTHONPATH=$installDir/lib/python3.8/site-packages", "CMAKE_PREFIX_PATH=$venv/lib/cmake/triqs"]) { deleteDir() /* note: this is installing into the parent (triqs) venv (install dir), which is thus shared among apps and so not be completely safe */