Commit 62d31de8 authored by Paul Lensing's avatar Paul Lensing
Browse files

Rewrote CMake build script. 

This should take care of existing build and linker issues. Standard OpenSSL and Protobuf libraries are no longer statically linked into the kinetic library but are normal dependencies. Removed dependency on gtest / gmock when not building the test system. Added cmake options to control linking of glog and gflag libraries and optionally handle openssl thread safety in the client. Removed some historical (now unused?) build features to simplify the build process, will re-add if anybody has demand for a feature.
parent f3cecc79

.travis.yml

+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 install protobuf; fi

  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install openssl; fi

  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew link openssl --force; fi

install:

  - cmake .

  - make

  - make -j 8

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

CMakeLists.txt

+282 −260

File changed.

Preview size limit exceeded, changes collapsed.

README.md

+50 −17

File changed.

Preview size limit exceeded, changes collapsed.

src/main/nonblocking_packet_sender.h

+0 −2
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 
#include <unordered_map>

#include <glog/logging.h>



#include "gmock/gmock.h"



#include "kinetic/nonblocking_packet_service_interface.h"

#include "kinetic/connection_options.h"

#include "kinetic/hmac_provider.h"

src/main/nonblocking_packet_service.h

+0 −2
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 
#include <unordered_map>

#include <glog/logging.h>



#include "gmock/gmock.h"



#include "kinetic/nonblocking_packet_service_interface.h"

#include "kinetic/connection_options.h"

#include "kinetic/hmac_provider.h"