diff --git a/CEP/pyparmdb/src/CMakeLists.txt b/CEP/pyparmdb/src/CMakeLists.txt index 2bf2129dbd3ac894963cbde3c76de1b4e9810372..156c02734739468915001dbab484fe4d6b20b494 100644 --- a/CEP/pyparmdb/src/CMakeLists.txt +++ b/CEP/pyparmdb/src/CMakeLists.txt @@ -1,6 +1,7 @@ # $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) diff --git a/CMake/PythonInstall.cmake b/CMake/PythonInstall.cmake index c3b71ff387570c61927c162a91a6f46336a3dba5..f941a09ed1f6858de8a65ade1b990ea1bb73e06f 100644 --- a/CMake/PythonInstall.cmake +++ b/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) diff --git a/LCS/pyparameterset/src/CMakeLists.txt b/LCS/pyparameterset/src/CMakeLists.txt index cd3fb2d26fb981a9cc6063b874dcf068fb192bea..a5085bcdd31ce4646d61e1b406bbe24b2a21a052 100644 --- a/LCS/pyparameterset/src/CMakeLists.txt +++ b/LCS/pyparameterset/src/CMakeLists.txt @@ -1,6 +1,7 @@ # $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)