diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2018-07-06 17:20:53 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2018-07-06 17:20:53 -0700 |
| commit | 0620c8159426dfc9ac5fb140f7838a1409fca5c5 (patch) | |
| tree | 60e59ff70ed0e319bb022ab6efbebb8477d342c4 | |
| parent | d1ee789558d9f6d71f96a354a9cc756953c80875 (diff) | |
| download | subsurface-0620c8159426dfc9ac5fb140f7838a1409fca5c5.tar.gz | |
build-system/macOS: try both possitble locations for googlemaps
And don't show an error for the one where it isn't.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 709600b08..5212c6e4d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -437,7 +437,8 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") install(DIRECTORY ${Grantlee5_DIR}/../../grantlee DESTINATION ${PLUGINDIR}) endif() install(CODE "execute_process(COMMAND mkdir -p ${PLUGINDIR}/geoservices)") - install(CODE "execute_process(COMMAND cp ${_qt5Core_install_prefix}/plugins/geoservices/libqtgeoservices_googlemaps.dylib ${PLUGINDIR}/geoservices)") + install(CODE "execute_process(COMMAND cp ${_qt5Core_install_prefix}/plugins/geoservices/libqtgeoservices_googlemaps.dylib ${PLUGINDIR}/geoservices ERROR_QUIET)") + install(CODE "execute_process(COMMAND cp ${CMAKE_SOURCE_DIR}/../install-root/${_qt5Core_install_prefix}/plugins/geoservices/libqtgeoservices_googlemaps.dylib ${PLUGINDIR}/geoservices ERROR_QUIET)") # 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} ${APP_BUNDLE_DIR} ${MACDEPLOY_ARGS})") |