Merge remote-tracking branch 'app4triqs-remote/3.0.x' into 3.0.x

TRIQS · Sep 10, 2020 · 682a257 · 682a257
2 parents b6809e7 + 76cb641
commit 682a257
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -103,11 +103,15 @@ target_compile_options(${PROJECT_NAME}_warnings
     -Wextra
     -Wpedantic
     -Wno-sign-compare
-    -Wno-deprecated-comma-subscript
+    $<$<CXX_COMPILER_ID:GNU>:-Wno-comma-subscript>
     $<$<CXX_COMPILER_ID:GNU>:-Wshadow=local>
     $<$<CXX_COMPILER_ID:GNU>:-Wno-attributes>
+    $<$<CXX_COMPILER_ID:Clang>:-Wno-deprecated-comma-subscript>
+    $<$<CXX_COMPILER_ID:Clang>:-Wno-unknown-warning-option>
     $<$<CXX_COMPILER_ID:Clang>:-Wshadow>
     $<$<CXX_COMPILER_ID:Clang>:-Wno-gcc-compat>
+    $<$<CXX_COMPILER_ID:AppleClang>:-Wno-deprecated-comma-subscript>
+    $<$<CXX_COMPILER_ID:AppleClang>:-Wno-unknown-warning-option>
     $<$<CXX_COMPILER_ID:AppleClang>:-Wshadow>
     $<$<CXX_COMPILER_ID:AppleClang>:-Wno-gcc-compat>
 )

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