File tree Expand file tree Collapse file tree 1 file changed +7
-4
lines changed Expand file tree Collapse file tree 1 file changed +7
-4
lines changed Original file line number Diff line number Diff line change @@ -21,19 +21,22 @@ set(VERSION_HDR_FILE ${CMAKE_CURRENT_SOURCE_DIR}/include/dwarfs/version.h)
21
21
22
22
execute_process (
23
23
COMMAND git rev-parse --show-toplevel
24
- OUTPUT_VARIABLE GIT_TOPLEVEL
24
+ OUTPUT_VARIABLE GIT_TOPLEVEL_RAW
25
25
OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET )
26
26
27
27
execute_process (
28
28
COMMAND git log --pretty=format:%h -n 1
29
29
OUTPUT_VARIABLE PRJ_GIT_REV
30
30
OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET )
31
31
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} " )
33
36
OR ("${PRJ_GIT_REV} " STREQUAL "" ))
34
37
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} ) " )
37
40
message ("PRJ_GIT_REV: ${PRJ_GIT_REV} " )
38
41
message (FATAL_ERROR "missing version files" )
39
42
endif ()
You can’t perform that action at this time.
0 commit comments