--- cmake/FindPython.cmake.orig 2013-01-11 00:10:37.730703018 +0000 +++ cmake/FindPython.cmake 2013-01-11 00:21:33.725664455 +0000 @@ -33,17 +33,9 @@ SET(PYTHON_FIND_QUIETLY TRUE) ENDIF(PYTHON_FOUND) -IF(ENABLE_PYTHON3) - FIND_PROGRAM(PYTHON_EXECUTABLE - NAMES python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python - PATHS /usr/bin /usr/local/bin /usr/pkg/bin - ) -ELSE(ENABLE_PYTHON3) - FIND_PROGRAM(PYTHON_EXECUTABLE - NAMES python2.7 python2.6 python2.5 python - PATHS /usr/bin /usr/local/bin /usr/pkg/bin - ) -ENDIF(ENABLE_PYTHON3) +FIND_PROGRAM(PYTHON_EXECUTABLE + NAMES ${BSD_PYTHON_CMD} + ) IF(PYTHON_EXECUTABLE) EXECUTE_PROCESS( @@ -65,32 +57,13 @@ NAMES Python.h PATHS ${PYTHON_INC_DIR} ) - IF(ENABLE_PYTHON3) - FIND_LIBRARY(PYTHON_LIBRARY - NAMES python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python - PATHS ${PYTHON_POSSIBLE_LIB_PATH} - ) - ELSE(ENABLE_PYTHON3) - FIND_LIBRARY(PYTHON_LIBRARY - NAMES python2.7 python2.6 python2.5 python - PATHS ${PYTHON_POSSIBLE_LIB_PATH} - ) - ENDIF(ENABLE_PYTHON3) + + FIND_LIBRARY(PYTHON_LIBRARY + NAMES ${BSD_PYTHON_VER} + ) IF(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH) - EXECUTE_PROCESS( - COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write(sys.version[:3])" - OUTPUT_VARIABLE PYTHON_VERSION - ) - EXECUTE_PROCESS( - COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write(str(sys.version_info < (2,5)))" - OUTPUT_VARIABLE PYTHON_OLD_VERSION - ) - IF(${PYTHON_OLD_VERSION} STREQUAL "True") - MESSAGE("Python >= 2.5 is needed to build python plugin, version found: ${PYTHON_VERSION}") - ELSE() - SET(PYTHON_FOUND TRUE) - ENDIF(${PYTHON_OLD_VERSION} STREQUAL "True") + SET(PYTHON_FOUND TRUE) ENDIF(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH) MARK_AS_ADVANCED(