From d43f475bd408f2f0bea1ec574388fb6a714b9321 Mon Sep 17 00:00:00 2001
From: Francois Keith <francois.keith@gmail.com>
Date: Fri, 15 Apr 2011 15:11:14 +0200
Subject: [PATCH] Clean cmake files by using the routines in cmake/python.cmake
---
src/CMakeLists.txt | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 99c3614..35d8897 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}
--
GitLab