From 0620c8159426dfc9ac5fb140f7838a1409fca5c5 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 6 Jul 2018 17:20:53 -0700 Subject: 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 --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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})") -- cgit v1.2.3-70-g09d2