4 files changed, 47 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml
index 53fd32ec..ec0b8636 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,6 @@
-language: objective-c
+os:
+  - osx
+  - linux
+language: c++
 before_script: scripts/travis/before-script.sh
 script: scripts/travis/script.sh
diff --git a/scripts/travis/before-script.sh b/scripts/travis/before-script.sh
index b8753159..99966882 100755
--- a/scripts/travis/before-script.sh
+++ b/scripts/travis/before-script.sh
@@ -1,6 +1,23 @@
 #!/bin/sh
 set -e
 
-brew update
-#brew install xctool
-brew install cmake
+if test x"`uname`" = xDarwin ; then
+  brew update
+  brew install cmake
+elif test x"`uname`" = xLinux ; then
+  git clone --depth=1 https://github.com/dinhviethoa/libetpan
+  cd libetpan
+  ./autogen.sh
+  make >/dev/null
+  sudo make install >/dev/null
+  cd ..
+
+  sudo apt-get install libctemplate-dev
+  sudo apt-get install libicu-dev
+  sudo apt-get install libctemplate-dev
+  sudo apt-get install libsasl2-dev
+  sudo apt-get install libtidy-dev
+  sudo apt-get install uuid-dev
+  sudo apt-get install libxml2-dev
+fi
+
diff --git a/scripts/travis/script.sh b/scripts/travis/script.sh
index 09e64fa6..0790e1d3 100755
--- a/scripts/travis/script.sh
+++ b/scripts/travis/script.sh
@@ -1,21 +1,26 @@
 #!/bin/sh
 set -e
 
-echo Building library for iPhoneOS
-xctool -project build-mac/mailcore2.xcodeproj -sdk iphoneos7.1 -scheme "static mailcore2 ios" build ARCHS="armv7 armv7s arm64"
-echo Building library for iPhoneSimulator
-xctool -project build-mac/mailcore2.xcodeproj -sdk iphonesimulator7.1 -scheme "static mailcore2 ios" build ARCHS="i386 x86_64"
-#echo Link test for iPhoneOS
-#xcodebuild -project build-mac/mailcore2.xcodeproj -sdk iphoneos7.1 -target "test-ios" CODE_SIGN_IDENTITY="" build
-echo Link test for iPhoneSimulator
-xctool -project build-mac/mailcore2.xcodeproj -sdk iphonesimulator7.1 -scheme "test-ios" build ARCHS="i386 x86_64"
+echo Operating system:
+uname
 
-echo Building library for Mac
-xctool -project build-mac/mailcore2.xcodeproj -sdk macosx10.8 -scheme "static mailcore2 osx" build
-echo Building framework for Mac
-xctool -project build-mac/mailcore2.xcodeproj -sdk macosx10.8 -scheme "mailcore osx" build
-echo Link test for Mac
-xctool -project build-mac/mailcore2.xcodeproj -sdk macosx10.8 -scheme "tests" build
+if test x"`uname`" = xDarwin ; then
+  echo Building library for iPhoneOS
+  xctool -project build-mac/mailcore2.xcodeproj -sdk iphoneos7.1 -scheme "static mailcore2 ios" build ARCHS="armv7 armv7s arm64"
+  echo Building library for iPhoneSimulator
+  xctool -project build-mac/mailcore2.xcodeproj -sdk iphonesimulator7.1 -scheme "static mailcore2 ios" build ARCHS="i386 x86_64"
+  #echo Link test for iPhoneOS
+  #xcodebuild -project build-mac/mailcore2.xcodeproj -sdk iphoneos7.1 -target "test-ios" CODE_SIGN_IDENTITY="" build
+  echo Link test for iPhoneSimulator
+  xctool -project build-mac/mailcore2.xcodeproj -sdk iphonesimulator7.1 -scheme "test-ios" build ARCHS="i386 x86_64"
+
+  echo Building library for Mac
+  xctool -project build-mac/mailcore2.xcodeproj -sdk macosx10.8 -scheme "static mailcore2 osx" build
+  echo Building framework for Mac
+  xctool -project build-mac/mailcore2.xcodeproj -sdk macosx10.8 -scheme "mailcore osx" build
+  echo Link test for Mac
+  xctool -project build-mac/mailcore2.xcodeproj -sdk macosx10.8 -scheme "tests" build
+fi
 
 echo Testing CMake build
 mkdir -p build-cmake
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dd506471..ba6ac17b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -29,6 +29,10 @@ IF(APPLE)
   
   execute_process(COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/../scripts/prepare.sh"
     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../scripts")
+ELSE()
+  set(additional_includes
+    /usr/include/libxml2
+  )
 ENDIF()
 
 # detect ctemplate