Find Boost in CMake, fix Travis

LMMS · Aug 29, 2017 · 6b557d2 · 6b557d2
1 parent b6421d4
commit 6b557d2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.travis/linux..install.sh b/.travis/linux..install.sh
@@ -3,7 +3,7 @@
 PACKAGES="cmake libsndfile-dev fftw3-dev libvorbis-dev libogg-dev libmp3lame-dev
 	libasound2-dev libjack-dev libsdl-dev libsamplerate0-dev libstk0-dev
 	libfluidsynth-dev portaudio19-dev wine-dev g++-multilib libfltk1.3-dev
-	libgig-dev libsoundio-dev"
+	libgig-dev libsoundio-dev libboost-dev"
 
 # Help with unmet dependencies
 PACKAGES="$PACKAGES libjack0"

diff --git a/.travis/osx..install.sh b/.travis/osx..install.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-PACKAGES="cmake pkgconfig fftw libogg libvorbis lame libsndfile libsamplerate jack sdl libgig libsoundio stk portaudio node fltk"
+PACKAGES="cmake pkgconfig boost fftw libogg libvorbis lame libsndfile libsamplerate jack sdl libgig libsoundio stk portaudio node fltk"
 
 if [ $QT5 ]; then
 	PACKAGES="$PACKAGES homebrew/versions/qt55"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -174,6 +174,10 @@ ELSE()
 	INCLUDE("${QT_USE_FILE}")
 ENDIF()
 
+# check for boost
+FIND_PACKAGE(Boost 1.54.0 REQUIRED)
+INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
+
 # check for libsndfile
 PKG_CHECK_MODULES(SNDFILE REQUIRED sndfile>=1.0.11)
 IF(NOT SNDFILE_FOUND)