From 7eea44ff3c88491be282eaad31a096710f1567d4 Mon Sep 17 00:00:00 2001
From: Marcel Loose <loose@astron.nl>
Date: Fri, 18 Sep 2009 11:54:17 +0000
Subject: [PATCH] Bug 1310: Now uses new python_install() macro
---
LCS/pyparameterset/CMakeLists.txt | 2 +-
LCS/pyparameterset/src/CMakeLists.txt | 5 +++++
LCS/pytools/src/CMakeLists.txt | 4 ++--
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/LCS/pyparameterset/CMakeLists.txt b/LCS/pyparameterset/CMakeLists.txt
index c554d65956e..3b4ad0bf9e5 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 a7cd13c9e43..9d8e8f65456 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 81aa8fc1470..bf37d83250c 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)
--
GitLab