From d0eed9269953f7e6a26dca3b4a40a049c74c1d46 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 15 Apr 2013 14:47:51 -0700
Subject: [PATCH] add an avatars library and move AvatarAgentData there

---
 avatar-mixer/CMakeLists.txt                              | 7 ++-----
 interface/CMakeLists.txt                                 | 5 +++--
 libraries/avatars/CMakeLists.txt                         | 9 +++++++++
 .../avatars}/src/AvatarAgentData.cpp                     | 0
 .../avatars}/src/AvatarAgentData.h                       | 0
 5 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 libraries/avatars/CMakeLists.txt
 rename {avatar-mixer => libraries/avatars}/src/AvatarAgentData.cpp (100%)
 rename {avatar-mixer => libraries/avatars}/src/AvatarAgentData.h (100%)

diff --git a/avatar-mixer/CMakeLists.txt b/avatar-mixer/CMakeLists.txt
index c3251fe513..76803e877a 100644
--- a/avatar-mixer/CMakeLists.txt
+++ b/avatar-mixer/CMakeLists.txt
@@ -9,10 +9,7 @@ set(MACRO_DIR ${ROOT_DIR}/cmake/macros)
 include(${MACRO_DIR}/SetupHifiProject.cmake)
 setup_hifi_project(${TARGET_NAME})
 
-# link the shared hifi library
+# link required hifi libraries
 include(${MACRO_DIR}/LinkHifiLibrary.cmake)
 link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
-
-# link the threads library
-find_package(Threads REQUIRED)
-target_link_libraries(${TARGET_NAME} ${CMAKE_THREAD_LIBS_INIT})
+link_hifi_library(avatars ${TARGET_NAME} ${ROOT_DIR})
\ No newline at end of file
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 257e88a571..ddb9f65d10 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -56,10 +56,11 @@ add_executable(${TARGET_NAME} MACOSX_BUNDLE ${INTERFACE_SRCS})
 
 # link in the hifi shared library
 include(${MACRO_DIR}/LinkHifiLibrary.cmake)
-link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
 
-# link in the hifi voxels library
+# link required hifi libraries
+link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
 link_hifi_library(voxels ${TARGET_NAME} ${ROOT_DIR})
+link_hifi_library(avatars ${TARGET_NAME} ${ROOT_DIR})
 
 # find required libraries
 find_package(GLM REQUIRED)
diff --git a/libraries/avatars/CMakeLists.txt b/libraries/avatars/CMakeLists.txt
new file mode 100644
index 0000000000..5ce41cb1c2
--- /dev/null
+++ b/libraries/avatars/CMakeLists.txt
@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 2.8)
+
+set(ROOT_DIR ../..)
+set(MACRO_DIR ${ROOT_DIR}/cmake/macros)
+
+set(TARGET_NAME avatars)
+
+include(${MACRO_DIR}/SetupHifiLibrary.cmake)
+setup_hifi_library(${TARGET_NAME})
\ No newline at end of file
diff --git a/avatar-mixer/src/AvatarAgentData.cpp b/libraries/avatars/src/AvatarAgentData.cpp
similarity index 100%
rename from avatar-mixer/src/AvatarAgentData.cpp
rename to libraries/avatars/src/AvatarAgentData.cpp
diff --git a/avatar-mixer/src/AvatarAgentData.h b/libraries/avatars/src/AvatarAgentData.h
similarity index 100%
rename from avatar-mixer/src/AvatarAgentData.h
rename to libraries/avatars/src/AvatarAgentData.h