LCPQ/dft_tools
3
0
Fork 0
mirror of https://github.com/triqs/dft_tools synced 2025-01-03 01:55:56 +01:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nils Wentzell 2020-09-10 13:11:48 -04:00
commit 682a257a1b
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -103,11 +103,15 @@ target_compile_options(${PROJECT_NAME}_warnings
-Wextra -Wextra
-Wpedantic -Wpedantic
-Wno-sign-compare -Wno-sign-compare
-Wno-deprecated-comma-subscript $<$<CXX_COMPILER_ID:GNU>:-Wno-comma-subscript>
$<$<CXX_COMPILER_ID:GNU>:-Wshadow=local> $<$<CXX_COMPILER_ID:GNU>:-Wshadow=local>
$<$<CXX_COMPILER_ID:GNU>:-Wno-attributes> $<$<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>:-Wshadow>
$<$<CXX_COMPILER_ID:Clang>:-Wno-gcc-compat> $<$<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>:-Wshadow>
$<$<CXX_COMPILER_ID:AppleClang>:-Wno-gcc-compat> $<$<CXX_COMPILER_ID:AppleClang>:-Wno-gcc-compat>
) )

13
deps/external_dependency.cmake vendored
View File

@ -72,9 +72,18 @@ function(external_dependency)
set(src_dir ${bin_dir}_src) set(src_dir ${bin_dir}_src)
if(NOT IS_DIRECTORY ${src_dir}) if(NOT IS_DIRECTORY ${src_dir})
if(ARG_GIT_TAG) 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() endif()
execute_process(COMMAND git clone ${ARG_GIT_REPO} --depth 1 ${clone_opts} ${src_dir})
endif() endif()
add_subdirectory(${src_dir} ${bin_dir} ${subdir_opts}) add_subdirectory(${src_dir} ${bin_dir} ${subdir_opts})
else() else()