From 96d3f5a27d4b68536a726cf38a3d31cdf37020c2 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 12 Apr 2013 13:25:59 -0700
Subject: [PATCH] move voxel to voxel-server, use setup project macro

---
 CMakeLists.txt                                 |  8 ++++----
 voxel-server/CMakeLists.txt                    | 15 +++++++++++++++
 {voxel => voxel-server}/src/VoxelAgentData.cpp |  0
 {voxel => voxel-server}/src/VoxelAgentData.h   |  0
 {voxel => voxel-server}/src/main.cpp           |  0
 voxel/CMakeLists.txt                           | 14 --------------
 6 files changed, 19 insertions(+), 18 deletions(-)
 create mode 100644 voxel-server/CMakeLists.txt
 rename {voxel => voxel-server}/src/VoxelAgentData.cpp (100%)
 rename {voxel => voxel-server}/src/VoxelAgentData.h (100%)
 rename {voxel => voxel-server}/src/main.cpp (100%)
 delete mode 100644 voxel/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 14972b5330..526ba77653 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,10 +2,10 @@ cmake_minimum_required(VERSION 2.8)
 
 project(hifi)
 
-add_subdirectory(space-server)
 add_subdirectory(avatar-mixer)
-add_subdirectory(domain-server)
 add_subdirectory(audio-mixer)
-add_subdirectory(voxel)
+add_subdirectory(domain-server)
 add_subdirectory(interface)
-add_subdirectory(injector)
\ No newline at end of file
+add_subdirectory(injector)
+add_subdirectory(space-server)
+add_subdirectory(voxel-server)
\ No newline at end of file
diff --git a/voxel-server/CMakeLists.txt b/voxel-server/CMakeLists.txt
new file mode 100644
index 0000000000..eaac46fc9f
--- /dev/null
+++ b/voxel-server/CMakeLists.txt
@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 2.8)
+
+set(TARGET_NAME voxel-server)
+
+set(MACRO_DIR ../cmake/macros)
+include(${MACRO_DIR}/SetupHifiProject.cmake)
+
+setup_hifi_project(${TARGET_NAME})
+
+# link in the shared library
+include(${MACRO_DIR}/LinkHifiLibrary.cmake)
+link_hifi_library(shared ${TARGET_NAME})
+
+# link in the hifi voxels library
+link_hifi_library(voxels ${TARGET_NAME})
\ No newline at end of file
diff --git a/voxel/src/VoxelAgentData.cpp b/voxel-server/src/VoxelAgentData.cpp
similarity index 100%
rename from voxel/src/VoxelAgentData.cpp
rename to voxel-server/src/VoxelAgentData.cpp
diff --git a/voxel/src/VoxelAgentData.h b/voxel-server/src/VoxelAgentData.h
similarity index 100%
rename from voxel/src/VoxelAgentData.h
rename to voxel-server/src/VoxelAgentData.h
diff --git a/voxel/src/main.cpp b/voxel-server/src/main.cpp
similarity index 100%
rename from voxel/src/main.cpp
rename to voxel-server/src/main.cpp
diff --git a/voxel/CMakeLists.txt b/voxel/CMakeLists.txt
deleted file mode 100644
index b4f077799e..0000000000
--- a/voxel/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-project(voxel)
-
-file(GLOB VOXEL_SRCS src/*.cpp src/*.h)
-
-add_executable(voxel ${VOXEL_SRCS})
-
-# link in the shared library
-include(../cmake/macros/LinkHifiLibrary.cmake)
-link_hifi_library(shared voxel)
-
-# link in the hifi voxels library
-link_hifi_library(voxels voxel)
\ No newline at end of file