Bug 1619: Moved derivation of build/install directory of python files from...

Bug 1619: Moved derivation of build/install directory of python files from FindPython.cmake to PythonInstall.cmake.

CEP/Calibration/BBSControl/CMakeLists.txt

@@ -7,7 +7,6 @@ include(LofarFindPackage)
 lofar_find_package(Boost REQUIRED)
 lofar_find_package(Casacore REQUIRED COMPONENTS casa)
 lofar_find_package(PQXX REQUIRED)
-lofar_find_package(Python REQUIRED)
 
 add_subdirectory(include/BBSControl)
 add_subdirectory(src)

CMake/FindPython.cmake

@@ -36,37 +36,16 @@ if(Python_FIND_REQUIRED)
   set(_options REQUIRED)
 endif(Python_FIND_REQUIRED)
 
-# Search for the Python interpreter
+# Search for the Python interpreter.
 find_package(PythonInterp ${_options})
 
-# Search for the Python header files and libraries
+# Search for the Python header files and libraries.
 find_package(PythonLibs ${_options})
 
-# Derive the Python site-packages installation directory and build directory
-if(NOT PYTHON_FOUND)
-  if(PYTHON_EXECUTABLE)
-    set(_cmd
-      "from distutils.sysconfig import get_python_lib"
-      "print get_python_lib(plat_specific=True, prefix='')")
-    execute_process(
-      COMMAND "${PYTHON_EXECUTABLE}" "-c" "${_cmd}"
-      OUTPUT_VARIABLE _pydir
-      ERROR_VARIABLE _err
-      OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if(_err)
-      message(FATAL_ERROR "Python command failed:\n${_err}")
-    endif(_err)
-    set(PYTHON_BUILD_DIR "${CMAKE_BINARY_DIR}/${_pydir}" CACHE PATH 
-      "Build directory for Python extensions")
-    set(PYTHON_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${_pydir}" CACHE PATH 
-      "Installation directory for Python extensions")
-  endif(PYTHON_EXECUTABLE)
-endif(NOT PYTHON_FOUND)
-
 # Set PYTHON_INCLUDE_DIRS variable, because FindPythonLibs does not do it.
 set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_PATH}")
 
-# Set PYTHON_FOUND to TRUE if both Python interpreter and libraries are found
+# Set PYTHON_FOUND to TRUE if both Python interpreter and libraries are found.
 set(PYTHON_FOUND FALSE)
 if(PYTHONINTERP_FOUND AND PYTHONLIBS_FOUND)
   set(PYTHON_FOUND TRUE)

CMake/PythonInstall.cmake

@@ -25,14 +25,35 @@
 #
 # $Id$
 
-macro(python_install)
+# Search for the Python interpreter
+find_package(PythonInterp)
+
+# Derive the Python site-packages installation directory and build directory
+if(PYTHON_EXECUTABLE)
+  set(_cmd
+    "from distutils.sysconfig import get_python_lib"
+    "print get_python_lib(plat_specific=True, prefix='')")
+  execute_process(
+    COMMAND "${PYTHON_EXECUTABLE}" "-c" "${_cmd}"
+    OUTPUT_VARIABLE _pydir
+    ERROR_VARIABLE _pyerr
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+  if(_pyerr)
+    message(FATAL_ERROR "Python command failed:\n${_pyerr}")
+  endif(_pyerr)
+  set(PYTHON_BUILD_DIR "${CMAKE_BINARY_DIR}/${_pydir}" CACHE PATH 
+    "Build directory for Python extensions")
+  set(PYTHON_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${_pydir}" CACHE PATH 
+    "Installation directory for Python extensions")
+endif(PYTHON_EXECUTABLE)
+
 
-  # Precondition checks.
-  if(NOT DEFINED PYTHON_INSTALL_DIR)
-    message(FATAL_ERROR "python_install: PYTHON_INSTALL_DIR is undefined."
-      "\nMaybe you forgot to do a `find_package(Python)'?")
-  endif(NOT DEFINED PYTHON_INSTALL_DIR)
+#
+# macro python_install
+#
+macro(python_install)
 
+  # Precondition check.
   if(NOT PYTHON_EXECUTABLE)
     message(FATAL_ERROR "python_install: Python interpreter not available")
   endif(NOT PYTHON_EXECUTABLE)
@@ -49,7 +70,7 @@ macro(python_install)
     message(FATAL_ERROR "python_install: destination directory invalid")
   endif(_dest_dir MATCHES "^$" OR _dest_dir MATCHES ";")
 
-  # Set python package install directory.
+  # Set python package build/install directory.
   set(_inst_dir "${PYTHON_INSTALL_DIR}/${_dest_dir}")
   set(_build_dir "${PYTHON_BUILD_DIR}/${_dest_dir}")