[Greater-commits] r276 - trunk/GREAT-ER-DB

[scm-commit@wald.intevation.org]

Author: bricks
Date: 2011-06-27 13:19:55 +0200 (Mon, 27 Jun 2011)
New Revision: 276

Modified:
   trunk/GREAT-ER-DB/CMakeLists.txt
Log:
Use found python command for all custom commands based on python
Python version evaluation is now included in our FindPythonInterp cmake file
Require at least python 2.3 because generatewrapper script uses optparse which is only available in python >= 2.3


Modified: trunk/GREAT-ER-DB/CMakeLists.txt
===================================================================
--- trunk/GREAT-ER-DB/CMakeLists.txt	2011-06-27 11:16:20 UTC (rev 275)
+++ trunk/GREAT-ER-DB/CMakeLists.txt	2011-06-27 11:19:55 UTC (rev 276)
@@ -43,16 +43,9 @@
 endif (PYDAGREATER_ENABLE_TESTS)
 
 find_package(Dagreater REQUIRED)
-find_package(PythonLibs REQUIRED)
+find_package(PythonLibs 2.3 REQUIRED)
 find_package(PythonInterp REQUIRED)
 
-if(PYTHON_EXECUTABLE)
-    execute_process(COMMAND "${PYTHON_EXECUTABLE}" --version ERROR_VARIABLE _VERSION OUTPUT_QUIET ERROR_STRIP_TRAILING_WHITESPACE)
-    string(REPLACE "Python " "" PYTHON_VERSION "${_VERSION}")
-    STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" PYTHON_VERSION_MAJOR "${PYTHON_VERSION}")
-    STRING(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+.*" "\\1" PYTHON_VERSION_MINOR "${PYTHON_VERSION}")
-    STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" PYTHON_VERSION_PATCH "${PYTHON_VERSION}")
-endif()
 
 set(DAGREATER_INSTALL_PATH "python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/GreaterDB")
 
@@ -96,7 +89,7 @@
 ADD_CUSTOM_COMMAND(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dagreater/_dagreater_pg.c
            ${CMAKE_CURRENT_BINARY_DIR}/dagreater/pydagreater.py
-    COMMAND ${CMAKE_SOURCE_DIR}/generatewrapper.py ${DEBUG_ARG}
+           COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/generatewrapper.py ${DEBUG_ARG}
             -o ${CMAKE_CURRENT_BINARY_DIR}/dagreater
             -i ${CMAKE_SOURCE_DIR}/dagreater
             DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dagreater/apispec.py ${CMAKE_SOURCE_DIR}/generatewrapper.py
@@ -106,7 +99,7 @@
     string(REPLACE ".py" ".pyc" PYTHON_COMPILED_FILE "${PYTHON_FILE}")
     get_filename_component(_target ${PYTHON_COMPILED_FILE} NAME)
     add_custom_target( ${_target} ALL
-        COMMAND pycompile
+        COMMAND ${PYTHON_EXECUTABLE} -m py_compile
                 ${PYTHON_FILE}
         COMMENT "Compiling ${PYTHON_FILE}"
         SOURCES ${PYTHON_FILE}