Updated build for OSX

This commit is contained in:
Jordan Sherer 2018-09-10 13:18:34 -04:00
parent 418e071a8d
commit e9aa4203b5
5 changed files with 12 additions and 6 deletions

View File

@ -67,11 +67,12 @@ endif ()
if ("${CPACK_GENERATOR}" STREQUAL "DragNDrop") if ("${CPACK_GENERATOR}" STREQUAL "DragNDrop")
set (CPACK_DMG_VOLUME_NAME "@PROJECT_NAME@") set (CPACK_DMG_VOLUME_NAME "@PROJECT_NAME@")
set (CPACK_DMG_BACKGROUND_IMAGE "@PROJECT_SOURCE_DIR@/icons/Darwin/DragNDrop Background.png") set (CPACK_DMG_BACKGROUND_IMAGE "@PROJECT_SOURCE_DIR@/icons/Darwin/DragNDrop Background.png")
set (CPACK_DMG_DS_STORE "@PROJECT_SOURCE_DIR@/Darwin/wsjtx_DMG.DS_Store") set (CPACK_DMG_DS_STORE "@PROJECT_SOURCE_DIR@/Darwin/ft8call_DMG.DS_Store")
set (CPACK_BUNDLE_NAME "@WSJTX_BUNDLE_NAME@") set (CPACK_BUNDLE_NAME "@WSJTX_BUNDLE_NAME@")
set (CPACK_PACKAGE_ICON "@PROJECT_BINARY_DIR@/wsjtx.icns") set (CPACK_PACKAGE_ICON "@PROJECT_BINARY_DIR@/ft8call.icns")
set (CPACK_BUNDLE_ICON "@PROJECT_BINARY_DIR@/wsjtx.icns") set (CPACK_BUNDLE_ICON "@PROJECT_BINARY_DIR@/ft8call.icns")
set (CPACK_BUNDLE_STARTUP_COMMAND "@PROJECT_SOURCE_DIR@/Mac-wsjtx-startup.sh") set (CPACK_BUNDLE_STARTUP_COMMAND "@PROJECT_SOURCE_DIR@/Mac-ft8call-startup.sh")
set (CPACK_PACKAGING_INSTALL_PREFIX "/")
endif () endif ()
if ("${CPACK_GENERATOR}" STREQUAL "WIX") if ("${CPACK_GENERATOR}" STREQUAL "WIX")

View File

@ -823,6 +823,7 @@ endif (WIN32)
# #
if (APPLE) if (APPLE)
set (WSJTX_BUNDLE_VERSION ${wsjtx_VERSION}) set (WSJTX_BUNDLE_VERSION ${wsjtx_VERSION})
set (CMAKE_INSTALL_PREFIX "/")
# make sure CMAKE_INSTALL_PREFIX ends in / # make sure CMAKE_INSTALL_PREFIX ends in /
string (LENGTH "${CMAKE_INSTALL_PREFIX}" LEN) string (LENGTH "${CMAKE_INSTALL_PREFIX}" LEN)

View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
WSJTX_BUNDLE="`echo "$0" | sed -e 's/\/Contents\/MacOS\/.*//'`" WSJTX_BUNDLE="`echo "$0" | sed -e 's/\/Contents\/MacOS\/.*//'`"
WSJTX_RESOURCES="$WSJTX_BUNDLE/Contents/Resources" WSJTX_RESOURCES="$WSJTX_BUNDLE/Contents/Resources"
WSJTX_TEMP="/tmp/wsjtx/$UID" WSJTX_TEMP="/tmp/ft8call/$UID"
echo "running $0" echo "running $0"
echo "WSJTX_BUNDLE: $WSJTX_BUNDLE" echo "WSJTX_BUNDLE: $WSJTX_BUNDLE"
@ -13,4 +13,4 @@ export "DYLD_LIBRARY_PATH=$WSJTX_RESOURCES/lib"
export "PATH=$WSJTX_RESOURCES/bin:$PATH" export "PATH=$WSJTX_RESOURCES/bin:$PATH"
#export #export
exec "$WSJTX_RESOURCES/bin/wsjtx" exec "$WSJTX_RESOURCES/bin/ft8call"

View File

@ -1,3 +1,7 @@
Notes on FT8Call Installation for Mac OS X
(replace all instances of WSJT-X with FT8Call)
Notes on WSJT-X Installation for Mac OS X Notes on WSJT-X Installation for Mac OS X
----------------------------------------- -----------------------------------------