diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-08-27 13:44:33 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-08-27 13:53:32 -0700 |
| commit | 4360cee196966d0fbfe4470c25364790a5579806 (patch) | |
| tree | decfc3d3cd4452d09fea30cac07cb96594428235 | |
| parent | 84c8213e140487af6ead0bf876f38204fe5fb878 (diff) | |
| download | subsurface-4360cee196966d0fbfe4470c25364790a5579806.tar.gz | |
Cmake: install grantlee plugins on Mac
And add a small message that two potential ERRORS that are thrown in the
deploy step are actually harmless.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index da98a218d..d52098a96 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -656,6 +656,7 @@ endforeach() if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") set(RESOURCEDIR ${CMAKE_BINARY_DIR}/Subsurface.app/Contents/Resources) + set(PLUGINDIR ${CMAKE_BINARY_DIR}/Subsurface.app/Contents/PlugIns) install(DIRECTORY marbledata/maps DESTINATION ${RESOURCEDIR}/data) install(DIRECTORY marbledata/bitmaps DESTINATION ${RESOURCEDIR}/data) install(DIRECTORY Documentation/images DESTINATION ${RESOURCEDIR}/share/Documentation) @@ -665,9 +666,13 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") install(FILES ${TRANSLATIONS} DESTINATION ${RESOURCEDIR}/translations) install(FILES ${QTTRANSLATIONS} DESTINATION ${RESOURCEDIR}/translations) install(FILES ${CMAKE_SOURCE_DIR}/gpl-2.0.txt DESTINATION ${RESOURCEDIR}) + # this is a HACK + install(DIRECTORY ${Grantlee5_DIR}/../../grantlee DESTINATION ${PLUGINDIR}) # this is a hack - but I don't know how else to find the macdeployqt program if it's not in the PATH string(REPLACE moc macdeployqt MACDEPLOYQT ${QT_MOC_EXECUTABLE}) install(CODE "execute_process(COMMAND ${MACDEPLOYQT} Subsurface.app)") + install(CODE "message(STATUS \"two ERRORS here about libmysqlclient and libpq not found are harmless\")") + endif() if(CMAKE_SYSTEM_NAME STREQUAL "Windows") |