diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -162,25 +162,13 @@ else() endif() # get revision number from mercurial -find_program(MERCURIAL hg) - -if (MERCURIAL) - execute_process(COMMAND ${MERCURIAL} id -i - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - RESULT_VARIABLE MERCURIAL_RESULT - OUTPUT_VARIABLE VERSION_REVISION - OUTPUT_STRIP_TRAILING_WHITESPACE) - if(NOT MERCURIAL_RESULT EQUAL 0) - set(VERSION_SCM_REVISION false) - endif(NOT MERCURIAL_RESULT EQUAL 0) -endif (MERCURIAL) - -if (NOT VERSION_REVISION) - set(VERSION_REVISION "0") -endif (NOT VERSION_REVISION) - -message("SCM revision: ${VERSION_REVISION}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVERSION_REVISION=\\\"${VERSION_REVISION}\\\" ") +include(GetVersion) +if (NOT ${HG_VERSION} STREQUAL "") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVERSION_STRING=\\\"${HG_VERSION}\\\" ") +endif() +if (NOT ${HG_REVISION} STREQUAL "") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVERSION_REVISION=\\\"${HG_REVISION}\\\" ") +endif() # add make run target add_custom_target(run