Changeset 899:7d166b8b8018 in lemon-main

Timestamp:

09/03/10 15:37:19 (14 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Phase:

public

Message:

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

File:

• CMakeLists.txt (modified) (4 diffs)

CMakeLists.txt

@@ -3 +3 @@
 SET(PROJECT_NAME "LEMON")
 PROJECT(${PROJECT_NAME})
+
+INCLUDE(FindPythonInterp)
 
 IF(EXISTS ${PROJECT_SOURCE_DIR}/cmake/version.cmake)
@@ -10 +12 @@
 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
@@ -26 +28 @@
     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.")
@@ -44 +50 @@
 CHECK_TYPE_SIZE("long long" LONG_LONG)
 SET(LEMON_HAVE_LONG_LONG ${HAVE_LONG_LONG})
-
-INCLUDE(FindPythonInterp)
 
 ENABLE_TESTING()