From 7a5a497725a6c81969264b5e3ee88f1bc3a8a82f Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Tue, 21 Nov 2017 19:40:48 -0500 Subject: [PATCH] version lib find correct directory when used as a submodule --- src/lib/version/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/version/CMakeLists.txt b/src/lib/version/CMakeLists.txt index 40f7228d8c..edb7750478 100644 --- a/src/lib/version/CMakeLists.txt +++ b/src/lib/version/CMakeLists.txt @@ -41,11 +41,12 @@ if (EXISTS ${PX4_SOURCE_DIR}/.git) file(READ ${PX4_SOURCE_DIR}/.git git_dir_path) string(STRIP ${git_dir_path} git_dir_path) string(REPLACE "gitdir: " "" git_dir_path ${git_dir_path}) - get_filename_component(git_dir_path ${git_dir_path} ABSOLUTE) + get_filename_component(git_dir_path "${git_dir_path}" REALPATH BASE_DIR ${PX4_SOURCE_DIR}) endif() else() message(FATAL_ERROR "is not a git repository") endif() + if(NOT IS_DIRECTORY "${git_dir_path}") message(FATAL_ERROR "${git_dir_path} is not a directory") endif() @@ -72,4 +73,4 @@ px4_add_module( ver_gen platforms__common ) -# vim: set noet ft=cmake fenc=utf-8 ff=unix : +