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:
Tres Finocchiaro
2017-01-02 17:14:52 -05:00
committed by GitHub
parent 89665b0be3
commit 6137fcc5a5
4 changed files with 8 additions and 4 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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)

View File

@@ -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"