... | ... |
@@ -4,4 +4,6 @@ |
4 | 4 |
PROJECT(${PROJECT_NAME}) |
5 | 5 |
|
6 |
INCLUDE(FindPythonInterp) |
|
7 |
|
|
6 | 8 |
IF(EXISTS ${PROJECT_SOURCE_DIR}/cmake/version.cmake) |
7 | 9 |
INCLUDE(${PROJECT_SOURCE_DIR}/cmake/version.cmake) |
... | ... |
@@ -10,5 +12,5 @@ |
10 | 12 |
ELSE() |
11 | 13 |
EXECUTE_PROCESS( |
12 |
COMMAND ./scripts/chg-len.py |
|
14 |
COMMAND ${PYTHON_EXECUTABLE} ./scripts/chg-len.py |
|
13 | 15 |
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} |
14 | 16 |
OUTPUT_VARIABLE HG_REVISION_PATH |
... | ... |
@@ -26,5 +28,9 @@ |
26 | 28 |
SET(HG_REVISION_ID "hg-tip") |
27 | 29 |
ELSE() |
28 |
|
|
30 |
IF(HG_REVISION_PATH STREQUAL "") |
|
31 |
SET(HG_REVISION_ID ${HG_REVISION}) |
|
32 |
ELSE() |
|
33 |
SET(HG_REVISION_ID ${HG_REVISION_PATH}.${HG_REVISION}) |
|
34 |
ENDIF() |
|
29 | 35 |
ENDIF() |
30 | 36 |
SET(LEMON_VERSION ${HG_REVISION_ID} CACHE STRING "LEMON version string.") |
... | ... |
@@ -45,6 +51,4 @@ |
45 | 51 |
SET(LEMON_HAVE_LONG_LONG ${HAVE_LONG_LONG}) |
46 | 52 |
|
47 |
INCLUDE(FindPythonInterp) |
|
48 |
|
|
49 | 53 |
ENABLE_TESTING() |
50 | 54 |
|
0 comments (0 inline)