diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 99c3614b38b5b68002ae708a8a29716eaba30884..35d8897b36cffec1740f3c43255e6ecdd89766a7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -16,17 +16,8 @@ # # Python # -INCLUDE(FindPythonLibs) -IF (NOT ${PYTHONLIBS_FOUND} STREQUAL TRUE) - MESSAGE(FATAL_ERROR "Python has not been found.") -ELSE() - MESSAGE(STATUS "PYTHON_LIBRARY=${PYTHON_LIBRARY}") -ENDIF (NOT ${PYTHONLIBS_FOUND} STREQUAL TRUE) - -INCLUDE(FindPythonInterp) -IF (NOT ${PYTHONINTERP_FOUND} STREQUAL TRUE) - MESSAGE(FATAL_ERROR "Python executable has not been found.") -ENDIF (NOT ${PYTHONINTERP_FOUND} STREQUAL TRUE) +INCLUDE(../cmake/python.cmake) +FINDPYTHON() INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) @@ -95,12 +86,6 @@ INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH} # Installation # -EXEC_PROGRAM(${PYTHON_EXECUTABLE} ARGS - "-c \"import sys, os; print os.sep.join(['lib', 'python' + sys.version[:3], 'site-packages'])\"" - OUTPUT_VARIABLE PYTHON_SITELIB) - -MESSAGE(STATUS "PYTHON_SITELIB=${PYTHON_SITELIB}") - SET(PYTHON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${PYTHON_SITELIB}/dynamic_graph) INSTALL(TARGETS ${PYTHON_MODULE}