From 036734eb76033fe76e0732999decc01f369e3657 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sun, 23 Sep 2018 11:24:26 -0400
Subject: [PATCH] cmake git submodules handle all paths consistently

 - relative to the PX4 source directory root
---
 cmake/common/px4_git.cmake | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/cmake/common/px4_git.cmake b/cmake/common/px4_git.cmake
index e0e666d4d8..fe60948f6f 100644
--- a/cmake/common/px4_git.cmake
+++ b/cmake/common/px4_git.cmake
@@ -68,19 +68,28 @@ function(px4_add_git_submodule)
 		REQUIRED TARGET PATH
 		ARGN ${ARGN})
 
-	execute_process(COMMAND ${PX4_SOURCE_DIR}/Tools/check_submodules.sh ${PATH}
-			WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-			)
+	set(REL_PATH)
+
+	if(IS_ABSOLUTE ${PATH})
+		file(RELATIVE_PATH REL_PATH ${PX4_SOURCE_DIR} ${PATH})
+	else()
+		file(RELATIVE_PATH REL_PATH ${PX4_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${PATH})
+	endif()
+
+	execute_process(
+		COMMAND Tools/check_submodules.sh ${REL_PATH}
+		WORKING_DIRECTORY ${PX4_SOURCE_DIR}
+		)
 
 	string(REPLACE "/" "_" NAME ${PATH})
 	string(REPLACE "." "_" NAME ${NAME})
 
 	add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/git_init_${NAME}.stamp
-		COMMAND bash ${PX4_SOURCE_DIR}/Tools/check_submodules.sh ${PATH}
+		COMMAND Tools/check_submodules.sh ${REL_PATH}
 		COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/git_init_${NAME}.stamp
 		DEPENDS ${PX4_SOURCE_DIR}/.gitmodules ${PATH}/.git
-		COMMENT "git submodule ${PATH}"
-		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+		COMMENT "git submodule ${REL_PATH}"
+		WORKING_DIRECTORY ${PX4_SOURCE_DIR}
 		USES_TERMINAL
 		)