Fix RPATH issue on OSX.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 90a0bbdfb7066c0fe6d54012a50965a095b42d93..7c1cfe4b4f15186903fde2d80cc508c6aa028530 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,10 @@
 project(EntityX)
 cmake_minimum_required(VERSION 2.8)
 
+if(NOT DEFINED CMAKE_MACOSX_RPATH)
+  set(CMAKE_MACOSX_RPATH 0)
+endif()
+
 set(ENTITYX_MAJOR_VERSION 1)
 set(ENTITYX_MINOR_VERSION 0)
 set(ENTITYX_PATCH_VERSION 0alpha1)

diff --git a/entityx/System_test.cc b/entityx/System_test.cc
index 675abb88b859127797925efcc8e12e9bf44853f5..5c8fb42cf8230f146464caa8c4bfd8f91e1de770 100644 (file)
--- a/entityx/System_test.cc
+++ b/entityx/System_test.cc
@@ -21,13 +21,13 @@ using namespace entityx;
 using std::string;
 
 struct Position : Component<Position> {
-  Position(float x = 0.0f, float y = 0.0f) : x(x), y(y) {}
+  explicit Position(float x = 0.0f, float y = 0.0f) : x(x), y(y) {}
 
   float x, y;
 };
 
 struct Direction : Component<Direction> {
-  Direction(float x = 0.0f, float y = 0.0f) : x(x), y(y) {}
+  explicit Direction(float x = 0.0f, float y = 0.0f) : x(x), y(y) {}
 
   float x, y;
 };