Configuring Travis CI with CMake

kraken/CMakeLists.txt

@@ -1,4 +1,8 @@
 include_directories(public)
+add_subdirectory(public)
+set(KRAKEN_PUBLIC_HEADERS "${KRAKEN_PUBLIC_HEADERS}" PARENT_SCOPE)
+
+add_sources(scalar.cpp)
 add_sources(vector2.cpp)
 add_sources(vector3.cpp)
 add_sources(vector4.cpp)
@@ -6,4 +10,3 @@ add_sources(triangle3.cpp)
 add_sources(quaternion.cpp)
 add_sources(matrix4.cpp)
 add_sources(aabb.cpp)
-

kraken/KRHelpers.h

@@ -7,6 +7,9 @@
 #include <GL/gl.h>
 #include <GL/glu.h>
 #include <GL/glext.h>
+#elif defined(__APPLE__)
+#include <OpenGL/gl3.h>
+#include <OpenGL/gl3ext.h>
 #endif
 #include "../3rdparty/tinyxml2/tinyxml2.h"
 

kraken/public/CMakeLists.txt

@@ -0,0 +1,10 @@
+add_public_header(kraken.h)
+add_public_header(scalar.h)
+add_public_header(vector2.h)
+add_public_header(vector3.h)
+add_public_header(vector4.h)
+add_public_header(triangle3.h)
+add_public_header(quaternion.h)
+add_public_header(aabb.h)
+add_public_header(matrix4.h)
+set(KRAKEN_PUBLIC_HEADERS "${KRAKEN_PUBLIC_HEADERS}" PARENT_SCOPE)

kraken/scalar.cpp

@@ -6,10 +6,14 @@
 //  Copyright (c) 2013 Kearwood Software. All rights reserved.
 //
 
-#include "public\kraken.h"
+#include "public/kraken.h"
 
-float kraken::SmoothStep(float a, float b, float t)
+namespace kraken {
+
+float SmoothStep(float a, float b, float t)
 {
     float d = (3.0 * t * t - 2.0 * t * t * t);
     return a * (1.0f - d) + b * d;
 }
+
+} // namespace kraken