diff options
| author | Cristián Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2019-10-29 12:40:52 +0100 |
|---|---|---|
| committer | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2019-10-29 16:11:06 +0000 |
| commit | a8448837204faee0b457d1e2d4cbf574a2811114 (patch) | |
| tree | bba09063d23a6598082854cf03327a6a956245e6 | |
| parent | fbaf2f2ed9b8e362361b83e1e2fe67a2f6672531 (diff) | |
Change-Id: I46ae59c8b3a4f9942361b13259f96e83236f8c5d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | CMakeLists.txt | 36 | ||||
| -rwxr-xr-x | pyside_tool.py | 5 |
2 files changed, 32 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 81a3aa5..ce65750 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,27 +46,47 @@ else() set(EXE_EXT "") endif() -install(FILES "${_qt5Core_install_prefix}/bin/uic${EXE_EXT}" - DESTINATION bin - PERMISSIONS - OWNER_EXECUTE OWNER_WRITE OWNER_READ - GROUP_EXECUTE GROUP_READ - WORLD_EXECUTE WORLD_READ) +set(TOOLS_PATH "${_qt5Core_install_prefix}/bin") +set(UIC_PATH "${TOOLS_PATH}/uic${EXE_EXT}") +set(RCC_PATH "${TOOLS_PATH}/rcc${EXE_EXT}") +if (APPLE) + set(DESIGNER_PATH "${TOOLS_PATH}/Designer.app") +else() + set(DESIGNER_PATH "${TOOLS_PATH}/designer${EXE_EXT}") +endif() -install(FILES "${_qt5Core_install_prefix}/bin/rcc${EXE_EXT}" +install(FILES "${UIC_PATH}" DESTINATION bin PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) -install(FILES "${_qt5Core_install_prefix}/bin/designer${EXE_EXT}" +install(FILES "${RCC_PATH}" DESTINATION bin PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) +if (EXISTS ${DESIGNER_PATH}) + if (APPLE) + install(DIRECTORY "${DESIGNER_PATH}" + DESTINATION bin + FILE_PERMISSIONS + OWNER_EXECUTE OWNER_WRITE OWNER_READ + GROUP_EXECUTE GROUP_READ + WORLD_EXECUTE WORLD_READ) + else() + install(FILES "${DESIGNER_PATH}" + DESTINATION bin + PERMISSIONS + OWNER_EXECUTE OWNER_WRITE OWNER_READ + GROUP_EXECUTE GROUP_READ + WORLD_EXECUTE WORLD_READ) + endif() +endif() + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY) diff --git a/pyside_tool.py b/pyside_tool.py index 1b3647d..da2d741 100755 --- a/pyside_tool.py +++ b/pyside_tool.py @@ -79,7 +79,10 @@ def rcc(): def designer(): - qt_tool_wrapper("designer", sys.argv[1:]) + if sys.platform == "darwin": + qt_tool_wrapper("Designer.app/Contents/MacOS/Designer", sys.argv[1:]) + else: + qt_tool_wrapper("designer", sys.argv[1:]) if __name__ == "__main__": |