diff --git a/LCS/pyparameterset/CMakeLists.txt b/LCS/pyparameterset/CMakeLists.txt index c554d65956e99637373d2223909c8b2fa5c9799c..3b4ad0bf9e564eac77bf71baa427806853a796c3 100644 --- a/LCS/pyparameterset/CMakeLists.txt +++ b/LCS/pyparameterset/CMakeLists.txt @@ -38,8 +38,8 @@ lofar_add_package(${PROJECT_NAME} 1.0 DEPENDS Common) ## External packages ## --------------------------------------------------------------------------- include(LofarFindPackage) -lofar_find_package(Python REQUIRED) lofar_find_package(Boost REQUIRED COMPONENTS python) +lofar_find_package(Python REQUIRED) lofar_find_package(Pyrap REQUIRED) ## --------------------------------------------------------------------------- diff --git a/LCS/pyparameterset/src/CMakeLists.txt b/LCS/pyparameterset/src/CMakeLists.txt index a7cd13c9e43d7a616f2ce074b1d145f4dbd0c9f4..9d8e8f654565971c5d264714fa871e1541b6dec2 100644 --- a/LCS/pyparameterset/src/CMakeLists.txt +++ b/LCS/pyparameterset/src/CMakeLists.txt @@ -31,3 +31,8 @@ set_target_properties(_pyparameterset PROPERTIES PREFIX "") lofar_add_bin_program(versionpyparameterset versionpyparameterset.cc Package__Version.cc) + +# Install Python modules +include(PythonInstall) +python_install(__init__.py + DESTINATION ${PYTHON_INSTALL_DIR}/lofar/parameterset) diff --git a/LCS/pytools/src/CMakeLists.txt b/LCS/pytools/src/CMakeLists.txt index 81aa8fc14705774d1839be9013a07880f8619bde..bf37d83250ca22d7f164821c453992778e267869 100644 --- a/LCS/pytools/src/CMakeLists.txt +++ b/LCS/pytools/src/CMakeLists.txt @@ -18,7 +18,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -include(PythonMacros) +include(PythonInstall) -python_install(__init__.py ${PYTHON_INSTALL_DIR}/lofar) +python_install(__init__.py DESTINATION ${PYTHON_INSTALL_DIR}/lofar)