Merge remote-tracking branch 'upstream/master'

2016-11-16 11:44:11 +01:00
parent 45a4a0022f 8ba73f5a1d
commit 331b81bf32
94 changed files with 1719 additions and 1402 deletions
--- a/modules/git_info/git_info.cmake
+++ b/modules/git_info/git_info.cmake
@ -65,6 +65,6 @@ function(generate_git_info_header _header_location _header_name)

  add_custom_target(
    git_info
-    ALL DEPENDS ${_header_location}/${_header_name}
+    ALL DEPENDS ${PROJECT_BINARY_DIR}/git_info.h
    )
 endfunction()