diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-11-01 08:56:23 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-11-01 08:56:23 +0100 |
| commit | 7e3807d048c5e0a8e0aa64fb49807bf5dfd11fc1 (patch) | |
| tree | 22029a8b36a593585dcd962b81ff80199a4f9984 /macosx | |
| parent | 664aefb41351113fbd43962aa534befe18ff9d4a (diff) | |
| parent | 0ff658f908bc3e07bca9987dfd5b7c365b7d8353 (diff) | |
Merge branch 'unstable' into trackhat
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | macosx/make-app-bundle.sh | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/macosx/CMakeLists.txt b/macosx/CMakeLists.txt new file mode 100644 index 00000000..214ea676 --- /dev/null +++ b/macosx/CMakeLists.txt @@ -0,0 +1,9 @@ +if(APPLE) + install(CODE " + execute_process(COMMAND /bin/sh \"${CMAKE_SOURCE_DIR}/macosx/make-app-bundle.sh\" + \"${CMAKE_SOURCE_DIR}/macosx\" + \"${CMAKE_INSTALL_PREFIX}\" + \"${CMAKE_BINARY_DIR}\" + \"${OPENTRACK_COMMIT}\") + ") +endif() diff --git a/macosx/make-app-bundle.sh b/macosx/make-app-bundle.sh index b8234443..ed7dbd39 100644 --- a/macosx/make-app-bundle.sh +++ b/macosx/make-app-bundle.sh @@ -14,6 +14,7 @@ test -n "$version" || exit 1 tmp="$(mktemp -d "/tmp/$APPNAME-tmp.XXXXXXX")" test $? -eq 0 || exit 1 +rm -f -- "$install/.DS_Store" sh "$dir/install-fail-tool" "$install" cp -R "$dir/opentrack.app" "$tmp/" || exit 1 |