OSX: Build full installer as part of the installer build via cmake
This commit is contained in:
parent
fe1568f4ca
commit
65b9fae5de
|
@ -388,6 +388,13 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
|||
set (BARRIER_BUNDLE_BINARY_DIR ${BARRIER_BUNDLE_APP_DIR}/Contents/MacOS)
|
||||
|
||||
configure_files (${BARRIER_BUNDLE_SOURCE_DIR} ${BARRIER_BUNDLE_DIR})
|
||||
|
||||
if (CMAKE_BUILD_TYPE STREQUAL "Release")
|
||||
add_custom_target(Barrier_dmg ALL
|
||||
bash build_installer.sh
|
||||
DEPENDS barrier barriers barrierc
|
||||
WORKING_DIRECTORY ${BARRIER_BUNDLE_DIR})
|
||||
endif()
|
||||
endif()
|
||||
|
||||
#
|
||||
|
|
|
@ -41,7 +41,10 @@ cp @CMAKE_RUNTIME_OUTPUT_DIRECTORY@/* . || exit 1
|
|||
# TODO: this is hacky and will probably break if there is more than one qt
|
||||
# version installed. need a better way to find this library
|
||||
B_COCOA=$(find /usr/local/Cellar/qt -type f -name libqcocoa.dylib | head -1)
|
||||
if [ $? -ne 0 ] || [ "x$B_COCOA" = "x" ]; then
|
||||
if [ "x$B_COCOA" = "x" ]; then
|
||||
B_COCOA=$(find /opt/local/libexec/qt5/plugins -type f -name libqcocoa.dylib | head -1)
|
||||
fi
|
||||
if [ "x$B_COCOA" = "x" ]; then
|
||||
echo "Could not find cocoa platform plugin"
|
||||
exit 1
|
||||
fi
|
||||
|
|
Loading…
Reference in New Issue