# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1420723183 -3600
# Node ID 2a3b0394fc2bc1fe7d22982a79566a4fb1fbf03c
# Parent  0786cbd3ade3261d9edcc8ea1f2b68993a216831
travis

diff -r 0786cbd3ade3 -r 2a3b0394fc2b .travis.yml
--- a/.travis.yml	Thu Jan 08 13:52:46 2015 +0100
+++ b/.travis.yml	Thu Jan 08 14:19:43 2015 +0100
@@ -1,15 +1,24 @@
 language: cpp
 
-os:
-  - linux
-
 compiler:
   - gcc
+  - clang
+
+os:
+  - linux
+  - osx
+
+osx_image: xcode61
 
 before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq build-essential unzip cmake mercurial uuid-dev libcurl4-openssl-dev liblua5.1-0-dev libgtest-dev libpng-dev libsqlite3-dev libssl-dev zlib1g-dev libdcmtk2-dev libwrap0-dev libcharls-dev
+  - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get update -qq && sudo apt-get install -qq build-essential unzip cmake mercurial uuid-dev libcurl4-openssl-dev liblua5.1-0-dev libgtest-dev libpng-dev libsqlite3-dev libssl-dev zlib1g-dev libdcmtk2-dev libwrap0-dev libcharls-dev; fi
+
+before_script:
+  - mkdir Build
+  - cd Build
+  - if [ $TRAVIS_OS_NAME == linux ]; then cmake "-DDCMTK_LIBRARIES=CharLS;dcmjpls;wrap;oflog" -DALLOW_DOWNLOADS=ON -DUSE_SYSTEM_BOOST=OFF -DUSE_SYSTEM_MONGOOSE=OFF -DUSE_SYSTEM_JSONCPP=OFF -DUSE_SYSTEM_GOOGLE_LOG=OFF -DUSE_SYSTEM_PUGIXML=OFF -DUSE_GTEST_DEBIAN_SOURCE_PACKAGE=ON ..; fi
+  - if [ $TRAVIS_OS_NAME == osx ]; then cmake -GXcode -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 -DSTATIC_BUILD=ON -DSTANDALONE_BUILD=ON -DALLOW_DOWNLOADS=ON ..; fi
 
 # Travis-CI uses Ubuntu 12.04 virtual machines, with Boost 1.46.0
 # (whereas Orthanc expects Boost >= 1.48.0)
-script: ./Resources/TravisUbuntu-12.04.sh
+script: make
diff -r 0786cbd3ade3 -r 2a3b0394fc2b Resources/TravisUbuntu-12.04.sh
--- a/Resources/TravisUbuntu-12.04.sh	Thu Jan 08 13:52:46 2015 +0100
+++ b/Resources/TravisUbuntu-12.04.sh	Thu Jan 08 14:19:43 2015 +0100
@@ -17,3 +17,4 @@
     ..
 
 make
+./UnitTests