diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-15 12:52:04 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-15 12:29:48 +0000 |
commit | 76e76e679ce04c266aa7f442ae5c016ecf3c7229 (patch) | |
tree | 0f7211bd42c441876743959bde927a311118431f | |
parent | c6904db287e3510e85d7f5519828075717f2e833 (diff) |
Use cmake install for typesystem files
install is better suited for distro installation
due to permission issues.
Amends 5d5eed53e49f4aaea85ce1638dd6fa3774a960e0.
Task-number: PYSIDE-589
Change-Id: I6539b7c9957fd542a39b68e2d63a66f544414cd7
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r-- | sources/pyside2/cmake/Macros/PySideModules.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sources/pyside2/cmake/Macros/PySideModules.cmake b/sources/pyside2/cmake/Macros/PySideModules.cmake index 5ba705b13..62136dce7 100644 --- a/sources/pyside2/cmake/Macros/PySideModules.cmake +++ b/sources/pyside2/cmake/Macros/PySideModules.cmake @@ -130,8 +130,9 @@ macro(create_pyside_module get_filename_component(typesystem_file_name "${typesystem_file}" NAME) file(READ "${typesystem_file}" typesystemXml) string(REGEX REPLACE "<load-typesystem name=\"[^/\"]+/" "<load-typesystem name=\"" typesystemXml "${typesystemXml}") - set(typesystem_target_file "${CMAKE_INSTALL_PREFIX}/share/PySide2${pyside2_SUFFIX}/typesystems/${typesystem_file_name}") + set (typesystem_target_file "${CMAKE_CURRENT_BINARY_DIR}/PySide2/typesystems/${typesystem_file_name}") file(WRITE "${typesystem_target_file}" "${typesystemXml}") + install(FILES "${typesystem_target_file}" DESTINATION share/PySide2${pyside2_SUFFIX}/typesystems) endforeach() endmacro() |