diff --git a/cmake/macros/FixupNitpick.cmake b/cmake/macros/FixupNitpick.cmake index 8685b27997..aa1176d5f1 100644 --- a/cmake/macros/FixupNitpick.cmake +++ b/cmake/macros/FixupNitpick.cmake @@ -11,6 +11,8 @@ macro(fixup_nitpick) if (APPLE) +message(STATUS ${QT_DIR}) +message(STATUS "____________________") string(REPLACE " " "\\ " ESCAPED_BUNDLE_NAME ${NITPICK_BUNDLE_NAME}) string(REPLACE " " "\\ " ESCAPED_INSTALL_PATH ${NITPICK_INSTALL_DIR}) set(_NITPICK_INSTALL_PATH "${ESCAPED_INSTALL_PATH}/${ESCAPED_BUNDLE_NAME}.app") @@ -19,7 +21,7 @@ macro(fixup_nitpick) if (NOT MACDEPLOYQT_COMMAND AND (PRODUCTION_BUILD OR PR_BUILD)) message(FATAL_ERROR "Could not find macdeployqt at ${QT_DIR}/bin.\ - It is required to produce an relocatable interface application.\ + It is required to produce a relocatable nitpick application.\ Check that the environment variable QT_DIR points to your Qt installation.\ ") endif () @@ -27,7 +29,7 @@ macro(fixup_nitpick) install(CODE " execute_process(COMMAND ${MACDEPLOYQT_COMMAND}\ \${CMAKE_INSTALL_PREFIX}/${_NITPICK_INSTALL_PATH}/\ - -verbose=2 -qmldir=${CMAKE_SOURCE_DIR}/interface/resources/qml/\ + -verbose=2 -qmldir=${CMAKE_SOURCE_DIR}/nitpick/resources/qml/\ )" COMPONENT ${CLIENT_COMPONENT} )