Making Python builds optional.

CMakeLists.txt

@@ -58,6 +58,7 @@ SET (BUILD_EXAMPLES FALSE CACHE BOOL "Build example programs")
 SET (BUILD_OPENCV FALSE CACHE BOOL "Build with OpenCV support")
 SET (BUILD_CLIENT FALSE CACHE BOOL "Build with client support library and executable")
 SET (BUILD_MATLAB FALSE CACHE BOOL "Build Matlab/Octave bindings")
+SET (BUILD_PYTHON FALSE CACHE BOOL "Build Python implementation")
 
 IF (BUILD_OPENCV)
   FIND_PACKAGE(OpenCV REQUIRED)
@@ -86,9 +87,9 @@ IF (BUILD_EXAMPLES)
 	ADD_SUBDIRECTORY(trackers)
 ENDIF (BUILD_EXAMPLES)
 
-FIND_PROGRAM(PYTHON "python")
+IF (BUILD_PYTHON)
+	FIND_PACKAGE(PythonInterp REQUIRED)
 
-IF (PYTHON)
     SET(SETUP_PY_IN "${CMAKE_CURRENT_SOURCE_DIR}/python/setup.py.in")
     SET(SETUP_PY "${CMAKE_CURRENT_BINARY_DIR}/python/setup.py")
     SET(DEPS "${CMAKE_CURRENT_SOURCE_DIR}/python/trax/__init__.py")
@@ -98,20 +99,20 @@ IF (PYTHON)
     CONFIGURE_FILE(${SETUP_PY_IN} ${SETUP_PY})
 
     ADD_CUSTOM_COMMAND(OUTPUT ${OUTPUT}
-                       COMMAND ${PYTHON} ${SETUP_PY} build ${DISTUTILS_BUILD_FLAGS}
+                       COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} build ${DISTUTILS_BUILD_FLAGS}
                        COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT}
                        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/python/
                        DEPENDS ${DEPS} ${SETUP_PY} COMMENT "Running Distutils")
 
     ADD_CUSTOM_TARGET(traxpython ALL DEPENDS ${OUTPUT})
 
 	IF (WIN32 OR WIN64)
-	SET(DISTUTILS_INSTALL_FLAGS --root="%DESTDIR%" ${DISTUTILS_INSTALL_FLAGS})
+	#SET(DISTUTILS_INSTALL_FLAGS --root="%DESTDIR%" ${DISTUTILS_INSTALL_FLAGS})
 	ELSE()
 	SET(DISTUTILS_INSTALL_FLAGS --root="$DESTDIR" ${DISTUTILS_INSTALL_FLAGS})
 	ENDIF()
-    INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON} ${SETUP_PY} install ${DISTUTILS_INSTALL_FLAGS} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/python/)" )
-ENDIF (PYTHON)
+    INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${SETUP_PY} install ${DISTUTILS_INSTALL_FLAGS} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/python/)" )
+ENDIF (BUILD_PYTHON)
 
 # CMake config file
 SET(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})