diff options
| author | Stephen Kelly <steveire@gmail.com> | 2017-01-13 18:06:28 +0000 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2017-01-13 18:06:28 +0000 |
| commit | 029798941a1082b8d5f00b7aaa234615d96844ca (patch) | |
| tree | b90a39c86a9e6b15c89088a87dfb272b25b8d03a | |
| parent | 8cf274317b437717f7e114e463de0652b973841b (diff) | |
| download | extra-cmake-modules-029798941a1082b8d5f00b7aaa234615d96844ca.tar.gz extra-cmake-modules-029798941a1082b8d5f00b7aaa234615d96844ca.tar.bz2 | |
Bindings: Make it possible to customise the installation directory
The dist-packages directory which is currently hardcoded is unsuitable
to non-debian package creation. Set the directory to 'site-packages' by
default.
| -rw-r--r-- | find-modules/FindPythonModuleGeneration.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/find-modules/FindPythonModuleGeneration.cmake b/find-modules/FindPythonModuleGeneration.cmake index 2e6172aa..4ef316a0 100644 --- a/find-modules/FindPythonModuleGeneration.cmake +++ b/find-modules/FindPythonModuleGeneration.cmake @@ -272,7 +272,7 @@ function(ecm_generate_python_binding modulename_keyword modulename_value ) - cmake_parse_arguments(GPB "" "RULES_FILE" "SIP_DEPENDS;SIP_INCLUDES;HEADERS" ${ARGN}) + cmake_parse_arguments(GPB "" "RULES_FILE;INSTALL_DIR_SUFFIX" "SIP_DEPENDS;SIP_INCLUDES;HEADERS" ${ARGN}) file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/sip/${pythonnamespace_value}/${modulename_value}/${modulename_value}mod.sip" " @@ -306,6 +306,9 @@ 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}) @@ -430,7 +433,7 @@ headers = sipAPI${modulename_value} add_test(NAME Py${pyversion}Test COMMAND ${GPB_PYTHON${pyversion}_COMMAND} "${CMAKE_SOURCE_DIR}/autotests/pythontest.py" ${CMAKE_CURRENT_BINARY_DIR}/py${pyversion}) install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/py${pyversion}/${pythonnamespace_value} - DESTINATION lib/python${pyversion${pyversion}_maj_min}/dist-packages) + DESTINATION lib/python${pyversion${pyversion}_maj_min}/${GPB_INSTALL_DIR_SUFFIX}) install(FILES ${sip_files} "${CMAKE_CURRENT_BINARY_DIR}/sip/${pythonnamespace_value}/${modulename_value}/${modulename_value}mod.sip" DESTINATION share/sip/${pythonnamespace_value}/${modulename_value} ) |