OSDN Git Service

let's try Ninja in Travis
authorIvailo Monev <xakepa10@laimg.moc>
Sat, 8 Oct 2016 00:01:06 +0000 (00:01 +0000)
committerIvailo Monev <xakepa10@laimg.moc>
Sat, 8 Oct 2016 00:01:06 +0000 (00:01 +0000)
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
.travis.yml

index f076ed5..6c4adc7 100644 (file)
@@ -11,14 +11,14 @@ git:
     depth: 3
 before_install:
     - sudo apt-get update -qq
-    - sudo apt-get install -qq python-dev libssl-dev zlib1g-dev libc6-dev libpng12-dev libjpeg-dev libtiff5-dev libmng-dev libcups2-dev libasound2-dev libfreetype6-dev libfontconfig1-dev libicu-dev libglib2.0-dev libdbus-1-dev libgtk2.0-dev libgl1-mesa-dev libwayland-dev unixodbc-dev libpq-dev libmysqld-dev libaio-dev libsqlite3-dev xorg-dev
+    - sudo apt-get install -qq ninja-build python-dev libssl-dev zlib1g-dev libc6-dev libpng12-dev libjpeg-dev libtiff5-dev libmng-dev libcups2-dev libasound2-dev libfreetype6-dev libfontconfig1-dev libicu-dev libglib2.0-dev libdbus-1-dev libgtk2.0-dev libgl1-mesa-dev libwayland-dev unixodbc-dev libpq-dev libmysqld-dev libaio-dev libsqlite3-dev xorg-dev
 before_script:
     - export DISPLAY=:99.0
     - sh -e /etc/init.d/xvfb start
     - sleep 3
 script:
-    - if [ "$CXX" == "clang++" ];then cmake -DENABLE_TESTING=TRUE -Wno-dev -DMYSQL_LIBRARIES:STRING="-lmysqld -lcrypt -laio" ;fi
-    - if [ "$CXX" == "g++" ];then cmake -DENABLE_TESTING=TRUE -DKATIE_ALLINONE=ON -Wno-dev -DMYSQL_LIBRARIES:STRING="-lmysqld -lcrypt -laio" ;fi
+    - if [ "$CXX" == "clang++" ];then cmake -GNinja -DENABLE_TESTING=TRUE -Wno-dev -DMYSQL_LIBRARIES:STRING="-lmysqld -lcrypt -laio" ;fi
+    - if [ "$CXX" == "g++" ];then cmake -GNinja -DENABLE_TESTING=TRUE -DKATIE_ALLINONE=ON -Wno-dev -DMYSQL_LIBRARIES:STRING="-lmysqld -lcrypt -laio" ;fi
     - make
 # the tests/benchmarks take more then 1-hour and Travis times out
 #    - ctest -V