Merge pull request #4760

8a7e20f8 build: older git versions don't have '-C' flag (xiphon)
This commit is contained in:
Riccardo Spagni 2018-11-06 14:47:27 +02:00
commit 4c621b13d0
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -176,8 +176,8 @@ if(NOT MANUAL_SUBMODULES)
find_package(Git) find_package(Git)
if(GIT_FOUND) if(GIT_FOUND)
function (check_submodule relative_path) function (check_submodule relative_path)
execute_process(COMMAND git -C ${relative_path} rev-parse "HEAD" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE localHead) execute_process(COMMAND git rev-parse "HEAD" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${relative_path} OUTPUT_VARIABLE localHead)
execute_process(COMMAND git rev-parse "HEAD:${relative_path}" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE checkedHead) execute_process(COMMAND git rev-parse "HEAD:${relative_path}" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE checkedHead)
string(COMPARE EQUAL "${localHead}" "${checkedHead}" upToDate) string(COMPARE EQUAL "${localHead}" "${checkedHead}" upToDate)
if (upToDate) if (upToDate)
message(STATUS "Submodule '${relative_path}' is up-to-date") message(STATUS "Submodule '${relative_path}' is up-to-date")