Bug 1619: PythonInstall now defines PYTHON_BUILD_DIR, so it should be included...

Bug 1619: PythonInstall now defines PYTHON_BUILD_DIR, so it should be included early. Furthermore, PYTHON_BUILD_DIR and PYTHON_INSTALL_DIR must be FORCEd into the cache.

CEP/pyparmdb/src/CMakeLists.txt

 # $Id$
 
 include(LofarPackageVersion)
+include(PythonInstall)
 
 # Add current build directory to the include path. This is needed, because
 # pyparmdb.cc #include's Package__Version.cc (yucky!).
@@ -24,5 +25,4 @@ lofar_add_library(lofar_pyparmdb Package__Version.cc)
 lofar_add_bin_program(versionpyparmdb versionpyparmdb.cc)
 
 # Install Python modules
-include(PythonInstall)
 python_install(__init__.py DESTINATION lofar/parmdb)

CMake/PythonInstall.cmake

@@ -42,9 +42,9 @@ if(PYTHON_EXECUTABLE)
     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")
+    "Build directory for Python extensions" FORCE)
   set(PYTHON_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${_pydir}" CACHE PATH 
-    "Installation directory for Python extensions")
+    "Installation directory for Python extensions" FORCE)
 endif(PYTHON_EXECUTABLE)
 
 

LCS/pyparameterset/src/CMakeLists.txt

 # $Id$
 
 include(LofarPackageVersion)
+include(PythonInstall)
 
 # Add current build directory to the include path. This is needed, because
 # pyparameterset.cc #include's Package__Version.cc (yucky!).
@@ -24,5 +25,4 @@ lofar_add_library(lofar_pyparameterset Package__Version.cc)
 lofar_add_bin_program(versionpyparameterset versionpyparameterset.cc)
 
 # Install Python modules
-include(PythonInstall)
 python_install(__init__.py DESTINATION lofar/parameterset)