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

Author: dylex

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']] disabled as libcxx leads to test failures due to different random number sequences */
+  ["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']] disabled as libcxx leads to test failures due to different random number sequences */
 ]
 for (int i = 0; i < osxPlatforms.size(); i++) {
   def platformEnv = osxPlatforms[i]
@@ -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",
           "NPY_DISTUTILS_APPEND_FLAGS=1"]) {
         deleteDir()

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()