Skip to content

Commit

Permalink
Explicitly define qt versions on Mac (#3201)
Browse files Browse the repository at this point in the history
* Explicitly define qt versions on Mac

Closes #3200

* Qt4 force Xcode8 pre-built binaries
* Don't do install tasks at configure time
  • Loading branch information
tresf authored Jan 2, 2017
1 parent 89665b0 commit 6137fcc
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .travis/osx..install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmake/apple/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 3 additions & 0 deletions cmake/apple/install_apple.sh.in
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 6137fcc

Please sign in to comment.