summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Okin <forkk@forkk.net>2013-03-19 13:26:25 -0700
committerAndrew Okin <forkk@forkk.net>2013-03-19 13:26:25 -0700
commite9ff6fcff73ad687f3688718a5d46e9296548bee (patch)
tree212467eeefc7bd09132a8b31dcc460ef4b798022
parentb14cd8d74a7fe2046bf0c208987536c175592f2b (diff)
parentbf49e58d1156edc78352e7d4f9998a2cbbe81268 (diff)
downloadMultiMC-e9ff6fcff73ad687f3688718a5d46e9296548bee.tar
MultiMC-e9ff6fcff73ad687f3688718a5d46e9296548bee.tar.gz
MultiMC-e9ff6fcff73ad687f3688718a5d46e9296548bee.tar.lz
MultiMC-e9ff6fcff73ad687f3688718a5d46e9296548bee.tar.xz
MultiMC-e9ff6fcff73ad687f3688718a5d46e9296548bee.zip
Merge pull request #3 from GUIpsp/master
Add travis CI building.
-rw-r--r--.travis.yml16
-rw-r--r--CMakeLists.txt2
2 files changed, 18 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..c94982f2
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,16 @@
+language: cpp
+compiler:
+ - gcc
+
+before_script:
+ - sudo apt-add-repository -y ppa:czchen/travis-ci
+ - sudo add-apt-repository -y ppa:ubuntu-sdk-team/ppa
+ - sudo add-apt-repository -y ppa:canonical-qt5-edgers/qt5-proper
+ - sudo apt-get update -yqq
+ - sudo apt-get install -yqq cmake
+ - sudo apt-get install -yqq ubuntu-sdk
+
+script: "cmake . && make -j4"
+
+notifications:
+ irc: "irc.esper.net#MultiMC"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf6e1aab..cc71a7dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -382,3 +382,5 @@ SET(CPACK_PACKAGE_INSTALL_DIRECTORY "MultiMC 5")
ENDIF()
INCLUDE(CPack)
+
+include_directories(${PROJECT_BINARY_DIR}/include)