Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 07:19:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Corrections.

Browse source
This commit is contained in:
NissimHadar 2019-01-16 17:30:13 -08:00
parent 7d5bb6eaf8
commit 2307be2785
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmake/macros/FixupNitpick.cmake
View file

@ -11,6 +11,8 @@
macro(fixup_nitpick) macro(fixup_nitpick)
if (APPLE) if (APPLE)
message(STATUS ${QT_DIR})
message(STATUS "____________________")
string(REPLACE " " "\\ " ESCAPED_BUNDLE_NAME ${NITPICK_BUNDLE_NAME}) string(REPLACE " " "\\ " ESCAPED_BUNDLE_NAME ${NITPICK_BUNDLE_NAME})
string(REPLACE " " "\\ " ESCAPED_INSTALL_PATH ${NITPICK_INSTALL_DIR}) string(REPLACE " " "\\ " ESCAPED_INSTALL_PATH ${NITPICK_INSTALL_DIR})
set(_NITPICK_INSTALL_PATH "${ESCAPED_INSTALL_PATH}/${ESCAPED_BUNDLE_NAME}.app") 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)) if (NOT MACDEPLOYQT_COMMAND AND (PRODUCTION_BUILD OR PR_BUILD))
message(FATAL_ERROR "Could not find macdeployqt at ${QT_DIR}/bin.\ 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.\ Check that the environment variable QT_DIR points to your Qt installation.\
") ")
endif () endif ()
@ -27,7 +29,7 @@ macro(fixup_nitpick)
install(CODE " install(CODE "
execute_process(COMMAND ${MACDEPLOYQT_COMMAND}\ execute_process(COMMAND ${MACDEPLOYQT_COMMAND}\
\${CMAKE_INSTALL_PREFIX}/${_NITPICK_INSTALL_PATH}/\ \${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} COMPONENT ${CLIENT_COMPONENT}
) )