diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c19d92115b807fdc97d464e4f687fe7c446a933..7e71d69fe2f8236577657ff40da66c10b74d24f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,23 +22,25 @@ target_link_libraries(application ) qt_generate_deploy_qml_app_script( + NO_UNSUPPORTED_PLATFORM_ERROR + DEPLOY_USER_QML_MODULES_ON_UNSUPPORTED_PLATFORM TARGET application FILENAME_VARIABLE deploy_script MACOS_BUNDLE_POST_BUILD ) -if(APPLE) +#if(APPLE) install(TARGETS application BUNDLE DESTINATION .) install(TARGETS ellipseShape LIBRARY DESTINATION application.app/Contents/Frameworks) install(SCRIPT ${deploy_script}) -elseif(WIN32) - install(TARGETS application ellipseShape RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - install(SCRIPT ${deploy_script}) -else() - install(TARGETS application ellipseShape) - install(SCRIPT ${deploy_script}) - # No Qt deploy runtime dependencies support, so we have to install all our - # own plugins so that their installed RPATH is set appropriately and it - # needs to be after the above deploy script - install(TARGETS ellipseShapeplugin LIBRARY DESTINATION qml/Shapes/EllipseShape) -endif() +#elseif(WIN32) + #install(TARGETS application ellipseShape RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + #install(SCRIPT ${deploy_script}) +#else() + #install(TARGETS application ellipseShape) + #install(SCRIPT ${deploy_script}) + ## No Qt deploy runtime dependencies support, so we have to install all our + ## own plugins so that their installed RPATH is set appropriately and it + ## needs to be after the above deploy script + #install(TARGETS ellipseShapeplugin LIBRARY DESTINATION qml/Shapes/EllipseShape) +#endif() diff --git a/main.cpp b/main.cpp index cba02ee944cffb4295c6d88669ebe9bc2bb95f6f..3f5054d21ec0a159c4b1877604dd7a2960348693 100644 --- a/main.cpp +++ b/main.cpp @@ -10,7 +10,7 @@ int main(int argc, char *argv[]) #ifdef Q_OS_OSX // Only needed when building an app bundle on macOS and we are using // shared libraries - engine.addImportPath(app.applicationDirPath() + "/../Resources/qml"); + //engine.addImportPath(app.applicationDirPath() + "/../Resources/qml"); #else // Installed applications typically put the executable in "bin" and the // QML modules under "qml". If there's no qt.conf file to tell us to look