Add support for Travis-CI.

Also ditched glog.

diff --git a/.travis.yml b/.travis.yml
new file mode 100644 (file)
index 0000000..e7ac9b8
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,17 @@
+language: cpp
+compiler:
+  - clang
+  - gcc
+before_install:
+  - sudo apt-add-repository -y ppa:jkeiren/ppa
+  - if test $CC = gcc; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi
+  - sudo apt-get update -qq
+  - sudo apt-get upgrade -y
+  - sudo apt-get install -y boost1.48
+  - if test $CC = gcc; then sudo apt-get install gcc-4.7 g++-4.7; fi
+  - if test $CC = gcc; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.7 20; fi
+  - if test $CC = gcc; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.7 20; fi
+  - if test $CC = gcc; then sudo update-alternatives --config gcc; fi
+  - if test $CC = gcc; then sudo update-alternatives --config g++; fi
+
+script: cmake -DBUILD_TESTING=1 && make && make test

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 257bb996f769ad05882231fa4ba8b787d421b2ec..9200f8c374afef81494a1f9e21771dcdc6bd0863 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 2.8)
 project(EntityX)
 include_directories(${CMAKE_CURRENT_LIST_DIR})
 
+set(RUN_BENCHMARKS false CACHE BOOL "Run benchmarks")
+
 include(${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
 # C++11 feature checks
 include(CheckCXX11Features.cmake)
@@ -21,7 +23,6 @@ macro(create_test TARGET_NAME SOURCE)
     target_link_libraries(
         ${TARGET_NAME}
         entityx
-        glog
         gtest
         gtest_main
         ${Boost_LIBRARIES}
@@ -66,7 +67,6 @@ add_library(entityx_shared SHARED ${sources})
 target_link_libraries(
     entityx_shared
     ${Boost_SIGNALS_LIBRARY}
-    glog
 )
 set_target_properties(entityx_shared PROPERTIES OUTPUT_NAME entityx)
 
@@ -85,7 +85,12 @@ if (BUILD_TESTING)
     create_test(component_test entityx/Components_test.cc)
     create_test(event_test entityx/Event_test.cc)
     create_test(system_test entityx/System_test.cc)
-    create_test(benchmarks_test entityx/Benchmarks_test.cc)
+    if (RUN_BENCHMARKS)
+        message("-- Running benchmarks")
+        create_test(benchmarks_test entityx/Benchmarks_test.cc)
+    else ()
+        message("-- Not running benchmarks (use -DRUN_BENCHMARKS=1 to enable)")
+    endif ()
 endif (BUILD_TESTING)
 
 file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/entityx/*.h")

diff --git a/entityx/Entity.h b/entityx/Entity.h
index 0e6d861af120baac389e23e6f37bd3091eeca0a4..65900b902393f2c9d396935ee33a7d74b81480ca 100644 (file)
--- a/entityx/Entity.h
+++ b/entityx/Entity.h
@@ -24,7 +24,6 @@
 #include <vector>
 
 #include <boost/shared_ptr.hpp>
-#include <glog/logging.h>
 #include "entityx/Event.h"
 
 namespace entityx {
@@ -360,7 +359,7 @@ class EntityManager : boost::noncopyable {
    * Emits EntityDestroyedEvent.
    */
   void destroy(Entity::Id entity) {
-    CHECK(entity < entity_component_mask_.size()) << "Entity::Id ID outside entity vector range";
+    assert(entity < entity_component_mask_.size() && "Entity::Id ID outside entity vector range");
     event_manager_.emit<EntityDestroyedEvent>(Entity(this, entity));
     for (auto &components : entity_components_) {
       components.at(entity).reset();

diff --git a/entityx/Entity_test.cc b/entityx/Entity_test.cc
index d3fcf8e1d6a4616558f64929d96badc60f4557e6..6443e75297471e4f1fe73bb7faf9e4b645bda846 100644 (file)
--- a/entityx/Entity_test.cc
+++ b/entityx/Entity_test.cc
@@ -12,7 +12,6 @@
 #include <string>
 #include <vector>
 #include <boost/ref.hpp>
-#include <glog/logging.h>
 #include <gtest/gtest.h>
 #include "entityx/Entity.h"
 

diff --git a/entityx/Event_test.cc b/entityx/Event_test.cc
index 91bdd169462a14b5761d5bcbb152151a31dfca33..4c16c3253fab11f0e14597f542ec07bafdcca0c8 100644 (file)
--- a/entityx/Event_test.cc
+++ b/entityx/Event_test.cc
@@ -10,7 +10,6 @@
 
 #include <string>
 #include <vector>
-#include <glog/logging.h>
 #include <gtest/gtest.h>
 #include "entityx/Event.h"
 

diff --git a/entityx/System.h b/entityx/System.h
index f1803b1798ad08d24f54edfaa932251d224fd8b6..962fd290755ed0cc69a6d82139ab89e1d5e06f1b 100644 (file)
--- a/entityx/System.h
+++ b/entityx/System.h
@@ -12,10 +12,10 @@
 
 
 #include <stdint.h>
+#include <cassert>
 #include <boost/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/unordered_map.hpp>
-#include <glog/logging.h>
 #include "entityx/Entity.h"
 #include "entityx/Event.h"
 
@@ -115,7 +115,7 @@ class SystemManager : boost::noncopyable {
   template <typename S>
   boost::shared_ptr<S> system() {
     auto it = systems_.find(S::family());
-    CHECK(it != systems_.end());
+    assert(it != systems_.end());
     return it == systems_.end()
         ? boost::shared_ptr<S>()
         : boost::static_pointer_cast<S>(it->second);
@@ -126,7 +126,7 @@ class SystemManager : boost::noncopyable {
    */
   template <typename S>
   void update(double dt) {
-    CHECK(initialized_) << "SystemManager::configure() not called";
+    assert(initialized_ && "SystemManager::configure() not called");
     boost::shared_ptr<S> s = system<S>();
     s->update(entities_, events_, dt);
   }

diff --git a/entityx/System_test.cc b/entityx/System_test.cc
index 85b08da09231e0a8a04ea007eaddd6b80f69be5b..c4648a08d20fffdcf402e8c3b4ac87f989e7e453 100644 (file)
--- a/entityx/System_test.cc
+++ b/entityx/System_test.cc
@@ -10,7 +10,6 @@
 
 #include <string>
 #include <vector>
-#include <glog/logging.h>
 #include <gtest/gtest.h>
 #include "entityx/Manager.h"
 #include "entityx/System.h"

diff --git a/gtest-1.6.0/src/gtest-internal-inl.h b/gtest-1.6.0/src/gtest-internal-inl.h
index 65a2101a4d8194a4fea7709240579b9e535c35aa..6554cfc07e619a79971822f7c6693e8fedaf4281 100644 (file)
--- a/gtest-1.6.0/src/gtest-internal-inl.h
+++ b/gtest-1.6.0/src/gtest-internal-inl.h
@@ -203,7 +203,6 @@ class GTestFlagSaver {
   bool list_tests_;
   String output_;
   bool print_time_;
-  bool pretty_;
   internal::Int32 random_seed_;
   internal::Int32 repeat_;
   bool shuffle_;