# HG changeset patch # User Alpar Juttner # Date 1283521039 -7200 # Node ID 7d166b8b8018ad5eb9b2852dd851439ebfbfab55 # Parent e74b5db4f2c65b830730864ea94f956100f39e0a Safer call of ./scripts/chg-len.py on Windows (#389) Still hard to get it worked properly by user. It needs - a python interpreter in the exec path - the mercurial modules accessible by this interpreter diff -r e74b5db4f2c6 -r 7d166b8b8018 CMakeLists.txt --- a/CMakeLists.txt Wed Aug 25 22:02:40 2010 +0200 +++ b/CMakeLists.txt Fri Sep 03 15:37:19 2010 +0200 @@ -3,13 +3,15 @@ SET(PROJECT_NAME "LEMON") PROJECT(${PROJECT_NAME}) +INCLUDE(FindPythonInterp) + IF(EXISTS ${PROJECT_SOURCE_DIR}/cmake/version.cmake) INCLUDE(${PROJECT_SOURCE_DIR}/cmake/version.cmake) ELSEIF(DEFINED ENV{LEMON_VERSION}) SET(LEMON_VERSION $ENV{LEMON_VERSION} CACHE STRING "LEMON version string.") ELSE() EXECUTE_PROCESS( - COMMAND ./scripts/chg-len.py + COMMAND ${PYTHON_EXECUTABLE} ./scripts/chg-len.py WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} OUTPUT_VARIABLE HG_REVISION_PATH ERROR_QUIET @@ -25,7 +27,11 @@ IF(HG_REVISION STREQUAL "") SET(HG_REVISION_ID "hg-tip") ELSE() - SET(HG_REVISION_ID ${HG_REVISION_PATH}.${HG_REVISION}) + IF(HG_REVISION_PATH STREQUAL "") + SET(HG_REVISION_ID ${HG_REVISION}) + ELSE() + SET(HG_REVISION_ID ${HG_REVISION_PATH}.${HG_REVISION}) + ENDIF() ENDIF() SET(LEMON_VERSION ${HG_REVISION_ID} CACHE STRING "LEMON version string.") ENDIF() @@ -44,8 +50,6 @@ CHECK_TYPE_SIZE("long long" LONG_LONG) SET(LEMON_HAVE_LONG_LONG ${HAVE_LONG_LONG}) -INCLUDE(FindPythonInterp) - ENABLE_TESTING() ADD_CUSTOM_TARGET(check COMMAND ${CMAKE_CTEST_COMMAND})