|
 |
80f82b |
From bfde1bec8426411f562011b30edcf05bc9561b0d Mon Sep 17 00:00:00 2001
|
|
|
80f82b |
From: Luca Beltrame <lbeltrame@kde.org>
|
|
|
80f82b |
Date: Sat, 2 Mar 2013 16:25:23 +0100
|
|
|
80f82b |
Subject: [PATCH] Ensure SIP files are installed to the right path basing on
|
|
|
80f82b |
the INSTALL_PREFIX, rather than hardcode install directories.
|
|
|
80f82b |
|
|
|
80f82b |
This allows full installation of PyKDE4 outside of the system
|
|
|
80f82b |
directories (the other bits were done in kdelibs prior to 4.10).
|
|
|
80f82b |
|
|
|
80f82b |
Based on a patch by Artem Serebriyskiy.
|
|
|
80f82b |
|
|
|
80f82b |
Reviewed by krop and tested by shumski.
|
|
|
80f82b |
|
|
|
80f82b |
REVIEW: 101903
|
|
|
80f82b |
CCMAIL: hrvoje.senjan@gmail.com
|
|
|
80f82b |
CCMAIL: v.for.vandal@gmail.com
|
|
|
80f82b |
---
|
|
|
80f82b |
CMakeLists.txt | 6 ++++--
|
|
|
80f82b |
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
80f82b |
|
|
|
80f82b |
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
80f82b |
index c2837b6..09fcc34 100644
|
|
|
80f82b |
--- a/CMakeLists.txt
|
|
|
80f82b |
+++ b/CMakeLists.txt
|
|
|
80f82b |
@@ -241,6 +241,8 @@ endforeach (_X ${SIP_DISABLE_FEATURES})
|
|
|
80f82b |
|
|
|
80f82b |
get_filename_component(LIB_DIR ${KDE4_LIB_DIR} NAME)
|
|
|
80f82b |
|
|
|
80f82b |
+set (SIP_FILES_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/sip)
|
|
|
80f82b |
+
|
|
|
80f82b |
set(SIP_CONFIGURATION "
|
|
|
80f82b |
kde_version_parts = '${KDE_VERSION}'.split('.')
|
|
|
80f82b |
kde_version_hex = int(kde_version_parts[0])*65536 + int(kde_version_parts[1])*256 + int(kde_version_parts[2])
|
|
|
80f82b |
@@ -258,7 +260,7 @@ _pkg_config = {
|
|
|
80f82b |
'pykde_kde_sip_flags': '${_SIP_TAGS} ${_SIP_X} ${SIP_EXTRA_OPTIONS}',
|
|
|
80f82b |
'pykde_mod_dir': '${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4',
|
|
|
80f82b |
'pykde_modules': '${PYKDE_MODULES}',
|
|
|
80f82b |
- 'pykde_sip_dir': '${SIP_DEFAULT_SIP_DIR}/PyKDE4',
|
|
|
80f82b |
+ 'pykde_sip_dir': '${SIP_FILES_INSTALL_DIR}/PyKDE4',
|
|
|
80f82b |
'pykde_version': kde_version_hex,
|
|
|
80f82b |
'pykde_version_str': '${KDE_VERSION}'
|
|
|
80f82b |
}
|
|
|
80f82b |
@@ -270,7 +272,7 @@ python_install(${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py ${PYTHON_SITE_PACKAGES
|
|
|
80f82b |
|
|
|
80f82b |
# Install the .sip files for anyone that wants to build bindings on top of PyKDE4.
|
|
|
80f82b |
# (Don't forget the / at the end of sip/.)
|
|
|
80f82b |
-install(DIRECTORY sip/ DESTINATION ${SIP_DEFAULT_SIP_DIR}/PyKDE4
|
|
|
80f82b |
+install(DIRECTORY sip/ DESTINATION ${SIP_FILES_INSTALL_DIR}/PyKDE4
|
|
|
80f82b |
PATTERN "*~" EXCLUDE # This sucks, why can't I just whitelist what I _do_ want?
|
|
|
80f82b |
PATTERN ".svn" EXCLUDE
|
|
|
80f82b |
PATTERN "*.in" EXCLUDE)
|
|
|
80f82b |
--
|
|
|
80f82b |
1.8.1.4
|
|
|
80f82b |
|