Commit 40fa9516 authored by plensing's avatar plensing Committed by GitHub
Browse files

Merge pull request #48 from Kinetic/feature/build-system

Rewrote CMake build script.
parents f3cecc79 8c3383fc
Loading
Loading
Loading
Loading
+11 −6
Original line number Diff line number Diff line
@@ -5,16 +5,21 @@ compiler:
os: 
  - linux
  - osx
before_install:
  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -y protobuf-compiler libprotobuf-dev; fi
  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update ; fi
  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install protobuf; fi
install:
  - cmake .
  - cmake -DBUILD_TEST=ON .
  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then cmake -DOPENSSL_STATIC=ON .; fi
  - make
before_script:
  - git clone https://github.com/Kinetic/kinetic-java
  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then export JAVA_HOME=$(/usr/libexec/java_home); fi
  - echo $JAVA_HOME
  - git clone https://github.com/Kinetic/kinetic-java
  - mvn -f ./kinetic-java/pom.xml -DskipTests clean package
  - ./kinetic-java/bin/startSimulator.sh &
  - sleep 10
script: 
  - ./kinetic_client_test
  - ./kinetic_integration_test
  - make check
  - make integration_test
+384 −263

File changed.

Preview size limit exceeded, changes collapsed.

+54 −16

File changed.

Preview size limit exceeded, changes collapsed.

cmake/FindGflags.cmake

0 → 100644
+31 −0

File added.

Preview size limit exceeded, changes collapsed.

cmake/FindGlog.cmake

0 → 100644
+31 −0

File added.

Preview size limit exceeded, changes collapsed.

Loading