Explicitly define qt versions on Mac (#3201)
* Explicitly define qt versions on Mac Closes #3200 * Qt4 force Xcode8 pre-built binaries * Don't do install tasks at configure time
This commit is contained in:
@@ -6,7 +6,8 @@ matrix:
|
||||
include:
|
||||
- env: TARGET_OS=win32
|
||||
- env: TARGET_OS=win64
|
||||
- os: osx
|
||||
- os: osx
|
||||
osx_image: xcode8.2
|
||||
- env: QT5=True
|
||||
- env: QT5=True TARGET_OS=win32
|
||||
- env: QT5=True TARGET_OS=win64
|
||||
|
||||
@@ -3,9 +3,9 @@
|
||||
PACKAGES="cmake pkgconfig fftw libogg libvorbis libsndfile libsamplerate jack sdl stk fluid-synth portaudio node fltk"
|
||||
|
||||
if [ $QT5 ]; then
|
||||
PACKAGES="$PACKAGES qt55"
|
||||
PACKAGES="$PACKAGES homebrew/versions/qt55"
|
||||
else
|
||||
PACKAGES="$PACKAGES qt"
|
||||
PACKAGES="$PACKAGES cartr/qt4/qt"
|
||||
fi
|
||||
|
||||
brew install $PACKAGES
|
||||
|
||||
@@ -10,7 +10,7 @@ SET(MACOSX_BUNDLE_MIMETYPE_ICON "project.icns")
|
||||
SET(MACOSX_BUNDLE_MIMETYPE_ID "io.lmms")
|
||||
SET(MACOSX_BUNDLE_PROJECT_URL "${PROJECT_URL}")
|
||||
|
||||
CONFIGURE_FILE("lmms.plist.in" "${CMAKE_INSTALL_PREFIX}/Info.plist")
|
||||
CONFIGURE_FILE("lmms.plist.in" "${CMAKE_BINARY_DIR}/Info.plist")
|
||||
CONFIGURE_FILE("install_apple.sh.in" "${CMAKE_BINARY_DIR}/install_apple.sh" @ONLY)
|
||||
CONFIGURE_FILE("package_apple.json.in" "${CMAKE_BINARY_DIR}/package_apple.json" @ONLY)
|
||||
|
||||
|
||||
@@ -53,6 +53,9 @@ fi
|
||||
|
||||
# Remove any old .app bundles
|
||||
rm -Rf "$APP"
|
||||
|
||||
# Copy/overwrite Info.plist
|
||||
\cp "@CMAKE_BINARY_DIR@/Info.plist" "@CMAKE_INSTALL_PREFIX@/"
|
||||
|
||||
# Create new bundle, copy our built code to it
|
||||
mkdir -p "$APP"
|
||||
|
||||
Reference in New Issue
Block a user