diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-12-17 11:09:23 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-12-17 11:50:41 -0800 |
| commit | 88d5fc0fbc6b1e48558cede0c404a1252a884368 (patch) | |
| tree | f0ce0b20e7e6f186ffe4133b1d69927d74398f22 /CMakeLists.txt | |
| parent | 7c095419f7f30203995fedcde23da6d541cf078c (diff) | |
| download | subsurface-88d5fc0fbc6b1e48558cede0c404a1252a884368.tar.gz | |
Cmake: more use of SUBSURFACE_TARGET and more complete macdepoyqt args
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e7fb224fc..5eee6d371 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -321,16 +321,15 @@ if(ANDROID) # Android template directory include(${QT_ANDROID_CMAKE}) set(ANDROID_PACKAGE_SOURCE_DIR, ${CMAKE_BINARY_DIR}/android-mobile) - add_qt_android_apk(subsurface-mobile.apk ${SUBSURFACE_TARGET} + add_qt_android_apk(${SUBSURFACE_TARGET}.apk ${SUBSURFACE_TARGET} PACKAGE_SOURCES ${CMAKE_CURRENT_LIST_DIR}/android-mobile ) elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set(APP_BUNDLE_DIR "${SUBSURFACE_TARGET}.app") if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable") - set(APP_BUNDLE_DIR Subsurface-mobile.app) - set(MACDEPLOY_ARGS "-qmldir=${APP_BUNDLE_DIR}/Contents/Frameworks/qml") - else() - set(APP_BUNDLE_DIR Subsurface.app) + set(EXTRA_MACDEPLOY_ARGS "-qmldir=${APP_BUNDLE_DIR}/Contents/Frameworks/qml ") endif() + set(MACDEPLOY_ARGS "${EXTRA_MACDEPLOY_ARGS}-executable=${APP_BUNDLE_DIR}/Contents/MacOS/${SUBSURFACE_TARGET} -always-overwrite") set(RESOURCEDIR ${CMAKE_BINARY_DIR}/${APP_BUNDLE_DIR}/Contents/Resources) set(PLUGINDIR ${CMAKE_BINARY_DIR}/${APP_BUNDLE_DIR}/Contents/PlugIns) install(DIRECTORY marbledata/maps DESTINATION ${RESOURCEDIR}/data) |