diff --git a/osx/CMakeLists.txt b/osx/CMakeLists.txt index b9adb221b..5ce47c1c4 100644 --- a/osx/CMakeLists.txt +++ b/osx/CMakeLists.txt @@ -4,19 +4,8 @@ if(APPLE_MACOS) set(bundleDir "\${CMAKE_INSTALL_PREFIX}/${APP_BUNDLE_DIR}") set(bundleContentsDir "${bundleDir}/Contents") - if(ENABLE_LAUNCHER) - # cross-compiled Qt 5 builds macdeployqt for target platform instead of host - if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL CMAKE_SYSTEM_PROCESSOR) - # deploy Qt dylibs with macdeployqt - find_program(TOOL_MACDEPLOYQT NAMES macdeployqt PATHS ${qt_base_dir}/bin) - endif() - if(TOOL_MACDEPLOYQT) - install(CODE " - execute_process(COMMAND - \"${TOOL_MACDEPLOYQT}\" \"${bundleDir}\" -verbose=2 - ) - ") - else() + if(ENABLE_LAUNCHER OR ENABLE_EDITOR) + if(USING_CONAN) # simulate macdeployqt behavior, main Qt libs are copied by conan get_target_property(qmakePath Qt5::qmake IMPORTED_LOCATION) execute_process(COMMAND @@ -33,6 +22,19 @@ if(APPLE_MACOS) \"[Paths]\nPlugins = PlugIns\" ) ") + else() + # note: cross-compiled Qt 5 builds macdeployqt for target platform instead of host + # deploy Qt dylibs with macdeployqt + find_program(TOOL_MACDEPLOYQT NAMES macdeployqt PATHS ${qt_base_dir}/bin) + if(TOOL_MACDEPLOYQT) + install(CODE " + execute_process(COMMAND + \"${TOOL_MACDEPLOYQT}\" \"${bundleDir}\" -verbose=2 + ) + ") + else() + message(WARNING "macdeployqt not found, running cpack would result in broken package") + endif() endif() endif()