From: <pan...@li...> - 2013-03-02 12:18:14
|
branch: details: http://panotools.hg.sourceforge.net/hgweb/panotools/panotools/hgroot/panotools/libpano/rev/489ef38b776c changeset: 772:489ef38b776c user: tmodes date: Sat Mar 02 13:18:41 2013 +0100 description: Use mercurial instead of subversion in CMake build diffstat: CMakeLists.txt | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diffs (37 lines): diff -r e4a5489e244d -r 489ef38b776c CMakeLists.txt --- a/CMakeLists.txt Sat Mar 02 13:14:32 2013 +0100 +++ b/CMakeLists.txt Sat Mar 02 13:18:41 2013 +0100 @@ -378,17 +378,25 @@ # This way we may omit the otherwise needed "--force" parameter when # installing from that rpm package. # ... Disabled for the moment, because configure.ac supplies a value -find_program(_svnversion svnversion) -message(STATUS "svnversion = ${_svnversion}") -if(NOT ${_svnversion} MATCHES "-NOTFOUND") - execute_process(COMMAND ${_svnversion} WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE CPACK_RPM_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE) - # We use this value also to set the package-patch-value - if(CPACK_RPM_PACKAGE_RELEASE MATCHES "^\([0-9]+\)") - #set(CPACK_PACKAGE_VERSION_PATCH ${CMAKE_MATCH_1}) +IF(EXISTS ${PROJECT_SOURCE_DIR}/.hg) + FIND_PROGRAM(_hg hg) + if(_hg) + execute_process(COMMAND ${_hg} summary + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + OUTPUT_VARIABLE LIBPANO_TIP_OUT + ERROR_VARIABLE LIBPANO_TIP_ERROR + OUTPUT_STRIP_TRAILING_WHITESPACE) + STRING(REGEX REPLACE "\n" ";" LIBPANO_TIP_LINES ${LIBPANO_TIP_OUT}) + foreach(_v_l ${LIBPANO_TIP_LINES}) + if(_v_l MATCHES ".*:[ ]+\([0-9]+\):[0-9a-f]+ tip$") + set(CPACK_PACKAGE_VERSION_PATCH "${LIBPANO_PATCH_VERSION}-${CMAKE_MATCH_1}hg") + break() + endif() + endforeach() endif() endif() -set(CPACK_SOURCE_PACKAGE_FILE_NAME "libpano13-${PACKAGE_VERSION}") +set(CPACK_SOURCE_PACKAGE_FILE_NAME "libpano13-${PANO_MAJOR_VERSION}.${PANO_MINOR_VERSION}.${CPACK_PACKAGE_VERSION_PATCH}") # Use dpkg-shlibdeps to get the needed dependences SET(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) |