Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cleanup cmake process so it doesn't barf on problems to detect the git version.

This commit is contained in:
Wilfried Goesgens 2016-08-25 11:37:21 +02:00
parent 53f5926d32
commit f598efe6e0
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -132,9 +132,14 @@ if (DEFINED GIT_EXE AND IS_DIRECTORY "${CMAKE_SOURCE_DIR}/.git")
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
COMMAND ${GIT_EXE} describe --all --tags --long --dirty=-dirty COMMAND ${GIT_EXE} describe --all --tags --long --dirty=-dirty
OUTPUT_VARIABLE GIT_OUTPUT) OUTPUT_VARIABLE GIT_OUTPUT)
string(STRIP ${GIT_OUTPUT} REPOSITORY_VERSION) if (NOT GIT_OUTPUT)
set(ARANGODB_BUILD_REPOSITORY ${REPOSITORY_VERSION}) set(ARANGODB_BUILD_REPOSITORY "GIT FAILED TO RETRIEVE THE VERSION")
set(HAVE_ARANGODB_BUILD_REPOSITORY "1") set(HAVE_ARANGODB_BUILD_REPOSITORY "1")
else()
string(STRIP ${GIT_OUTPUT} REPOSITORY_VERSION)
set(ARANGODB_BUILD_REPOSITORY ${REPOSITORY_VERSION})
set(HAVE_ARANGODB_BUILD_REPOSITORY "1")
endif()
else () else ()
set(ARANGODB_BUILD_REPOSITORY "") set(ARANGODB_BUILD_REPOSITORY "")
set(HAVE_ARANGODB_BUILD_REPOSITORY "0") set(HAVE_ARANGODB_BUILD_REPOSITORY "0")
@ -889,3 +894,5 @@ endif()
add_custom_target(packages add_custom_target(packages
DEPENDS ${PACKAGES_LIST} DEPENDS ${PACKAGES_LIST}
) )
message(INFO "Building for git revision: ${ARANGODB_BUILD_REPOSITORY}")

8
cmake/ArangoDBInstall.cmake
View File

@ -113,8 +113,8 @@ configure_file (
#-------------------------------------------------------------------------------- #--------------------------------------------------------------------------------
get_cmake_property(_variableNames VARIABLES) #get_cmake_property(_variableNames VARIABLES)
foreach (_variableName ${_variableNames}) #foreach (_variableName ${_variableNames})
message(STATUS "${_variableName}=${${_variableName}}") # message(STATUS "${_variableName}=${${_variableName}}")
endforeach() #endforeach()
#-------------------------------------------------------------------------------- #--------------------------------------------------------------------------------