From 3e6b794f11725df851b9dfd37c9573c142541334 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 12 Apr 2013 13:12:56 -0700
Subject: [PATCH] rename domain target to domain server, use SetupHifiProject

---
 CMakeLists.txt                         |  2 +-
 cmake/macros/SetupHifiProject.cmake    |  2 +-
 domain-server/CMakeLists.txt           | 11 +++++++++++
 {domain => domain-server}/src/main.cpp |  0
 domain/CMakeLists.txt                  | 13 -------------
 5 files changed, 13 insertions(+), 15 deletions(-)
 create mode 100644 domain-server/CMakeLists.txt
 rename {domain => domain-server}/src/main.cpp (100%)
 delete mode 100644 domain/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc359ba7ab..29931d6793 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ project(hifi)
 
 add_subdirectory(space)
 add_subdirectory(avatar-mixer)
-add_subdirectory(domain)
+add_subdirectory(domain-server)
 add_subdirectory(mixer)
 add_subdirectory(voxel)
 add_subdirectory(interface)
diff --git a/cmake/macros/SetupHifiProject.cmake b/cmake/macros/SetupHifiProject.cmake
index a85a1fa69e..3b6f130073 100644
--- a/cmake/macros/SetupHifiProject.cmake
+++ b/cmake/macros/SetupHifiProject.cmake
@@ -2,7 +2,7 @@ MACRO(SETUP_HIFI_PROJECT TARGET)
     project(${TARGET})
     
     # grab the implemenation and header files
-    file(GLOB TARGET_SRCS /src/*.cpp src/*.h)
+    file(GLOB TARGET_SRCS src/*.cpp src/*.h)
     
     # add the executable
     add_executable(${TARGET} ${TARGET_SRCS})
diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt
new file mode 100644
index 0000000000..6642fc090a
--- /dev/null
+++ b/domain-server/CMakeLists.txt
@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 2.8)
+set(MACRO_DIR ../cmake/macros)
+
+set(TARGET_NAME domain-server)
+
+include(${MACRO_DIR}/SetupHifiProject.cmake)
+setup_hifi_project(${TARGET_NAME})
+
+# link the shared hifi library
+include(${MACRO_DIR}/LinkHifiLibrary.cmake)
+link_hifi_library(shared ${TARGET_NAME})
\ No newline at end of file
diff --git a/domain/src/main.cpp b/domain-server/src/main.cpp
similarity index 100%
rename from domain/src/main.cpp
rename to domain-server/src/main.cpp
diff --git a/domain/CMakeLists.txt b/domain/CMakeLists.txt
deleted file mode 100644
index 1d86bfa036..0000000000
--- a/domain/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-project(domain)
-
-# grab the implementation / header files
-file(GLOB DOMAIN_SRCS src/*.cpp src/*.h)
-
-# add an executable with the source files
-add_executable(domain ${DOMAIN_SRCS})
-
-# link the shared hifi library
-include(../cmake/macros/LinkHifiLibrary.cmake)
-link_hifi_library(shared domain)
\ No newline at end of file