Skip to content

Commit 60333cb

Browse files
committed
Update hash correctly if APR is a submodule
1 parent 49ed242 commit 60333cb

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

CMakeLists.txt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,20 @@ cmake_minimum_required(VERSION 3.2)
55
project(LibAPR)
66
set(CMAKE_CXX_STANDARD 14)
77

8+
get_cmake_property(_variableNames VARIABLES)
9+
foreach (_variableName ${_variableNames})
10+
message(STATUS "${_variableName}=${${_variableName}}")
11+
endforeach()
12+
813
###############################################################################
914
# Generate configuration file
1015
###############################################################################
1116
set (APR_VERSION_MAJOR 1)
1217
set (APR_VERSION_MINOR 0)
1318
set (APR_VERSION_PATCH 0)
14-
execute_process(COMMAND git rev-parse HEAD OUTPUT_VARIABLE APR_GIT_HASH)
19+
execute_process(COMMAND git rev-parse HEAD WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} OUTPUT_VARIABLE APR_GIT_HASH)
20+
message(STATUS "============== ${APR_GIT_HASH}")
21+
message(STATUS "============== ${PROJECT_SOURCE_DIR}")
1522
string(REGEX REPLACE "\n$" "" APR_GIT_HASH "${APR_GIT_HASH}")
1623
configure_file (
1724
"${PROJECT_SOURCE_DIR}/src/ConfigAPR.h.in"
@@ -65,7 +72,7 @@ set(SOURCE_FILES_RAYCAST src/vis/Camera.cpp src/vis/Object.cpp src/vis/Raytraced
6572

6673
add_library(libapr ${SOURCE_FILES} ${SOURCE_FILES_RAYCAST})
6774
set_target_properties(libapr PROPERTIES PREFIX "")
68-
target_include_directories(libapr PUBLIC . src external/glm)
75+
target_include_directories(libapr PUBLIC . src external/glm ${PROJECT_BINARY_DIR})
6976
target_link_libraries(libapr PUBLIC ${HDF5_LIBRARIES} ${TIFF_LIBRARIES} blosc_shared)
7077

7178
###############################################################################

0 commit comments

Comments
 (0)