diff options
| author | Stefan Brüns <stefan.bruens@rwth-aachen.de> | 2018-09-30 22:30:47 +0200 |
|---|---|---|
| committer | Stefan Brüns <stefan.bruens@rwth-aachen.de> | 2018-10-16 03:25:00 +0200 |
| commit | c2639d5698dcb5e024dd1e91e5631aa654dc0914 (patch) | |
| tree | caaaca483d20f87c380f538cdbdf80438f2c85b6 | |
| parent | 72aa6e1bf19cb6beb58d56245e925d27030b52de (diff) | |
| download | extra-cmake-modules-c2639d5698dcb5e024dd1e91e5631aa654dc0914.tar.gz extra-cmake-modules-c2639d5698dcb5e024dd1e91e5631aa654dc0914.tar.bz2 | |
Bindings: Remove INSTALL_DIR_SUFFIX from ecm_generate_python_binding
Summary:
The option is no longer used from any framework, and was always defaulting
to site-packages previously, as INSTALL_DIR_SUFFIX was empty.
Also see D15558, D15845.
Test Plan: build e.g kcoreaddons
Reviewers: #frameworks, apol, lbeltrame
Reviewed By: lbeltrame
Subscribers: lbeltrame, kde-frameworks-devel, kde-buildsystem
Tags: #frameworks, #build_system
Differential Revision: https://phabricator.kde.org/D15867
| -rw-r--r-- | find-modules/FindPythonModuleGeneration.cmake | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/find-modules/FindPythonModuleGeneration.cmake b/find-modules/FindPythonModuleGeneration.cmake index 15f89f0f..b33915fa 100644 --- a/find-modules/FindPythonModuleGeneration.cmake +++ b/find-modules/FindPythonModuleGeneration.cmake @@ -288,7 +288,7 @@ endfunction() function(ecm_generate_python_binding) - set(oneValueArgs TARGET PYTHONNAMESPACE MODULENAME RULES_FILE INSTALL_DIR_SUFFIX) + set(oneValueArgs TARGET PYTHONNAMESPACE MODULENAME RULES_FILE) set(multiValueArgs SIP_DEPENDS SIP_INCLUDES HEADERS) cmake_parse_arguments(GPB "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) @@ -325,10 +325,6 @@ function(ecm_generate_python_binding) set(GPB_RULES_FILE "${GPB_MODULE_DIR}/Qt5Ruleset.py") endif() - if (NOT GPB_INSTALL_DIR_SUFFIX) - set(GPB_INSTALL_DIR_SUFFIX site-packages) - endif() - list(APPEND generator_depends ${GPB_RULES_FILE}) foreach(hdr ${GPB_HEADERS}) @@ -446,7 +442,7 @@ headers = sipAPI${GPB_MODULENAME} OUTPUT_NAME "${GPB_MODULENAME}") if (GPB_SIP_DEPENDS MATCHES PyKF5) - set(_kf5_python_prefix ${CMAKE_INSTALL_PREFIX}/lib/python${pyversion${pyversion}_maj_min}/${GPB_INSTALL_DIR_SUFFIX}) + set(_kf5_python_prefix ${CMAKE_INSTALL_PREFIX}/lib/python${pyversion${pyversion}_maj_min}/site-packages) else() set(_kf5_python_prefix ${CMAKE_BINARY_DIR}/py${pyversion}) endif() @@ -456,7 +452,7 @@ headers = sipAPI${GPB_MODULENAME} ) install(DIRECTORY ${CMAKE_BINARY_DIR}/py${pyversion}/${GPB_PYTHONNAMESPACE} - DESTINATION lib/python${pyversion${pyversion}_maj_min}/${GPB_INSTALL_DIR_SUFFIX}) + DESTINATION lib/python${pyversion${pyversion}_maj_min}/site-packages) install(FILES ${sip_files} "${CMAKE_CURRENT_BINARY_DIR}/sip/${GPB_PYTHONNAMESPACE}/${GPB_MODULENAME}/${GPB_MODULENAME}mod.sip" DESTINATION share/sip/${GPB_PYTHONNAMESPACE}/${GPB_MODULENAME} ) |