From c63e886444294bdfaf2c12c8082a6df0c0b5c0a5 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 8 Aug 2014 10:04:34 -0700
Subject: [PATCH] don't look backwards for fbx header from avatars library
---
cmake/macros/IncludeHifiLibraryHeaders.cmake | 4 +---
libraries/avatars/CMakeLists.txt | 1 +
libraries/avatars/src/HeadData.cpp | 3 +--
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/cmake/macros/IncludeHifiLibraryHeaders.cmake b/cmake/macros/IncludeHifiLibraryHeaders.cmake
index 7ac31f5259..913d1e1181 100644
--- a/cmake/macros/IncludeHifiLibraryHeaders.cmake
+++ b/cmake/macros/IncludeHifiLibraryHeaders.cmake
@@ -10,7 +10,5 @@
#
macro(include_hifi_library_headers LIBRARY)
-
- include_directories("${HIFI_LIBRARY_DIR}/libraries/${LIBRARY}/src")
-
+ include_directories("${HIFI_LIBRARY_DIR}/${LIBRARY}/src")
endmacro(include_hifi_library_headers _library _root_dir)
\ No newline at end of file
diff --git a/libraries/avatars/CMakeLists.txt b/libraries/avatars/CMakeLists.txt
index 10507f7836..138b218381 100644
--- a/libraries/avatars/CMakeLists.txt
+++ b/libraries/avatars/CMakeLists.txt
@@ -5,6 +5,7 @@ setup_hifi_library(${TARGET_NAME})
include_glm(${TARGET_NAME} "${ROOT_DIR}")
link_hifi_libraries(${TARGET_NAME} shared octree voxels networking)
+include_hifi_library_headers(fbx)
find_package(Qt5 COMPONENTS Network Script)
diff --git a/libraries/avatars/src/HeadData.cpp b/libraries/avatars/src/HeadData.cpp
index 538085af30..2bdb203034 100644
--- a/libraries/avatars/src/HeadData.cpp
+++ b/libraries/avatars/src/HeadData.cpp
@@ -11,14 +11,13 @@
#include <glm/gtx/quaternion.hpp>
+#include <FBXReader.h>
#include <GLMHelpers.h>
#include <OctreeConstants.h>
#include "AvatarData.h"
#include "HeadData.h"
-#include "../fbx/src/FBXReader.h"
-
HeadData::HeadData(AvatarData* owningAvatar) :
_baseYaw(0.0f),
_basePitch(0.0f),