From a75a3f943482f5886ef87187978428cce12f66fc Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 8 Aug 2014 10:06:56 -0700 Subject: [PATCH] don't look backwards for script-engine headers from particles library --- libraries/particles/CMakeLists.txt | 1 + libraries/particles/src/Particle.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/particles/CMakeLists.txt b/libraries/particles/CMakeLists.txt index 0f8a555cb5..0ab11e3f82 100644 --- a/libraries/particles/CMakeLists.txt +++ b/libraries/particles/CMakeLists.txt @@ -5,6 +5,7 @@ setup_hifi_library(${TARGET_NAME}) include_glm(${TARGET_NAME} "${ROOT_DIR}") link_hifi_libraries(${TARGET_NAME} shared octree fbx networking animation) +include_hifi_library_headers(script-engine) find_package(Qt5 COMPONENTS Gui Network Script) diff --git a/libraries/particles/src/Particle.cpp b/libraries/particles/src/Particle.cpp index fef2b95fdc..5db285ebeb 100644 --- a/libraries/particles/src/Particle.cpp +++ b/libraries/particles/src/Particle.cpp @@ -22,7 +22,7 @@ // I'm open to other potential solutions. Could we change cmake to allow libraries to reference each others // headers, but not link to each other, this is essentially what this construct is doing, but would be // better to add includes to the include path, but not link -#include "../../script-engine/src/ScriptEngine.h" +#include #include "ParticlesScriptingInterface.h" #include "Particle.h"