Skip to content

Commit 1e46f22

Browse files
committed
Use real directory paths in version.cmake (fixes gh #47)
1 parent c97105f commit 1e46f22

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

cmake/version.cmake

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,22 @@ set(VERSION_HDR_FILE ${CMAKE_CURRENT_SOURCE_DIR}/include/dwarfs/version.h)
2121

2222
execute_process(
2323
COMMAND git rev-parse --show-toplevel
24-
OUTPUT_VARIABLE GIT_TOPLEVEL
24+
OUTPUT_VARIABLE GIT_TOPLEVEL_RAW
2525
OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)
2626

2727
execute_process(
2828
COMMAND git log --pretty=format:%h -n 1
2929
OUTPUT_VARIABLE PRJ_GIT_REV
3030
OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)
3131

32-
if((NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${GIT_TOPLEVEL}")
32+
get_filename_component(GIT_TOPLEVEL "${GIT_TOPLEVEL_RAW}" REALPATH)
33+
get_filename_component(REAL_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" REALPATH)
34+
35+
if((NOT "${REAL_SOURCE_DIR}" STREQUAL "${GIT_TOPLEVEL}")
3336
OR ("${PRJ_GIT_REV}" STREQUAL ""))
3437
if(NOT EXISTS ${VERSION_SRC_FILE} OR NOT EXISTS ${VERSION_HDR_FILE})
35-
message("CMAKE_CURRENT_SOURCE_DIR: ${CMAKE_CURRENT_SOURCE_DIR}")
36-
message("GIT_TOPLEVEL: ${GIT_TOPLEVEL}")
38+
message("REAL_SOURCE_DIR: ${REAL_SOURCE_DIR} (${CMAKE_CURRENT_SOURCE_DIR})")
39+
message("GIT_TOPLEVEL: ${GIT_TOPLEVEL} (${GIT_TOPLEVEL_RAW})")
3740
message("PRJ_GIT_REV: ${PRJ_GIT_REV}")
3841
message(FATAL_ERROR "missing version files")
3942
endif()

0 commit comments

Comments
 (0)