From 32a9a1cc2573268dbd5eaa21801ca06344e6c986 Mon Sep 17 00:00:00 2001
From: MarPiRK <marpirk@gmail.com>
Date: Tue, 26 May 2015 20:51:48 +0200
Subject: [PATCH] All features enabled for Travis, overlay-scrollbar fix

---
 .travis.yml                 | 9 ++++-----
 CMakeLists.txt              | 6 +++---
 src/gui/widgets/Scrollbar.h | 2 +-
 src/mathtex/CMakeLists.txt  | 4 ++--
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bd7a6487..9eb9148f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +3,11 @@ language: cpp
 # clang is not supported for poppler
 compiler: gcc
 
+os: linux
+
 before_install:
   - "sudo apt-get update -qq"
-  - "sudo apt-get install -y glade-gtk2 libopenjpeg-dev mm-common"
+  - "sudo apt-get install -y glade-gtk2 libopenjpeg-dev libcppunit-dev liboverlay-scrollbar-0.2-dev dvipng texlive"
   - "wget https://launchpad.net/ubuntu/+source/cmake/2.8.8-2ubuntu1/+build/3441442/+files/cmake_2.8.8-2ubuntu1_amd64.deb"
   - "wget https://launchpad.net/ubuntu/+archive/primary/+files/cmake-data_2.8.8-2ubuntu1_all.deb"
   - "sudo apt-get remove cmake-data cmake"
@@ -18,8 +20,5 @@ before_script:
   - "cd build"
 
 script:
-  - "cmake .. -DBUILD_BOOST:BOOL=ON -DEXT_GLIBMM:BOOL=ON -DCMAKE_DEBUG_INCLUDES_LDFLAGS:BOOL=ON"
+  - "cmake .. -DBUILD_BOOST=ON -DEXT_GLIBMM=ON -DCMAKE_DEBUG_INCLUDES_LDFLAGS=ON -DENABLE_MATHTEX=ON -DENABLE_OS=ON -DENABLE_CPPUNIT=ON -DUNSTABLE_LAYERS_SIDEBAR=ON"
   - "make"
-
-os: linux
-
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f9174609..c941f067 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,14 +120,14 @@ set (PACKAGE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/share")
 # CppUnit
 option (ENABLE_CPPUNIT "Build CppUnit test instead of xournalpp application" OFF)
 if (ENABLE_CPPUNIT)
-  pkg_check_modules (CppUnit REQUIRED "cppunit >= 1.13-0")
+  pkg_check_modules (CppUnit REQUIRED "cppunit >= 1.12-0")
 endif (ENABLE_CPPUNIT)
 
 # Overlay scrollbar
 option (ENABLE_OS "Overlay Scrollbar support" OFF)
 if (ENABLE_OS)
-  pkg_check_modules (os REQUIRED "overlay-scrollbar-0.1 >= 0.1.12")
-  add_includes_ldflags ("${os_LDFLAGS}" "${${_INCLUDE_DIRS}")
+  pkg_check_modules (OS REQUIRED "overlay-scrollbar-0.2")
+  add_includes_ldflags ("${OS_LDFLAGS}" "${OS_INCLUDE_DIRS}")
 endif (ENABLE_OS)
 
 # Mathtex
diff --git a/src/gui/widgets/Scrollbar.h b/src/gui/widgets/Scrollbar.h
index 049c7ab9..23ad2b2b 100644
--- a/src/gui/widgets/Scrollbar.h
+++ b/src/gui/widgets/Scrollbar.h
@@ -11,7 +11,7 @@
 
 #pragma once
 
-#include <config.h>
+#include <config-features.h>
 #include <XournalType.h>
 
 #ifdef ENABLE_OS
diff --git a/src/mathtex/CMakeLists.txt b/src/mathtex/CMakeLists.txt
index 6e68826e..cec74a5d 100644
--- a/src/mathtex/CMakeLists.txt
+++ b/src/mathtex/CMakeLists.txt
@@ -1,11 +1,11 @@
 find_program (PATH_LATEX "latex")
 if (NOT PATH_LATEX)
-  message (ERROR "\"latex\" command not found! You must install latex before installing mathtex.")
+  message (FATAL_ERROR "\"latex\" command not found! You must install latex before installing mathtex.")
 endif (NOT PATH_LATEX)
 
 find_program (PATH_DVIPNG "dvipng")
 if (NOT PATH_DVIPNG)
-  message (ERROR "\"dvipng\" command not found! You must install dvipng before installing mathtex.")
+  message (FATAL_ERROR "\"dvipng\" command not found! You must install dvipng before installing mathtex.")
 endif (NOT PATH_DVIPNG)
 
 include (CheckIncludeFiles)