From aa2c0b4722cfd43c0a148db6f0b0bcf2d5899bf6 Mon Sep 17 00:00:00 2001 From: Alec Thomas Date: Mon, 27 Oct 2014 11:27:19 +1100 Subject: Fix RPATH issue on OSX. --- CMakeLists.txt | 4 ++++ entityx/System_test.cc | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 90a0bbd..7c1cfe4 100755 --- 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 675abb8..5c8fb42 100644 --- a/entityx/System_test.cc +++ b/entityx/System_test.cc @@ -21,13 +21,13 @@ using namespace entityx; using std::string; struct Position : Component { - 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(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; }; -- cgit v1.2.3