From 44c20991831e93c353e247c3b1f1f1ffc3657c62 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 12 Apr 2013 13:23:07 -0700 Subject: [PATCH] move space to space-server, use setup project macro --- CMakeLists.txt | 2 +- space-server/CMakeLists.txt | 11 +++++++++++ {space => space-server}/example.data.txt | 0 {space => space-server}/src/TreeNode.cpp | 0 {space => space-server}/src/TreeNode.h | 0 {space => space-server}/src/main.cpp | 0 space/CMakeLists.txt | 10 ---------- 7 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 space-server/CMakeLists.txt rename {space => space-server}/example.data.txt (100%) rename {space => space-server}/src/TreeNode.cpp (100%) rename {space => space-server}/src/TreeNode.h (100%) rename {space => space-server}/src/main.cpp (100%) delete mode 100644 space/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index e33241280a..14972b5330 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8) project(hifi) -add_subdirectory(space) +add_subdirectory(space-server) add_subdirectory(avatar-mixer) add_subdirectory(domain-server) add_subdirectory(audio-mixer) diff --git a/space-server/CMakeLists.txt b/space-server/CMakeLists.txt new file mode 100644 index 0000000000..c7ee39ef22 --- /dev/null +++ b/space-server/CMakeLists.txt @@ -0,0 +1,11 @@ +cmake_minimum_required(VERSION 2.8) + +set(TARGET_NAME space-server) + +set(MACRO_DIR ../cmake/macros) +include(${MACRO_DIR}/SetupHifiProject.cmake) + +setup_hifi_project(${TARGET_NAME}) + +include(${MACRO_DIR}/LinkHifiLibrary.cmake) +link_hifi_library(shared ${TARGET_NAME}) \ No newline at end of file diff --git a/space/example.data.txt b/space-server/example.data.txt similarity index 100% rename from space/example.data.txt rename to space-server/example.data.txt diff --git a/space/src/TreeNode.cpp b/space-server/src/TreeNode.cpp similarity index 100% rename from space/src/TreeNode.cpp rename to space-server/src/TreeNode.cpp diff --git a/space/src/TreeNode.h b/space-server/src/TreeNode.h similarity index 100% rename from space/src/TreeNode.h rename to space-server/src/TreeNode.h diff --git a/space/src/main.cpp b/space-server/src/main.cpp similarity index 100% rename from space/src/main.cpp rename to space-server/src/main.cpp diff --git a/space/CMakeLists.txt b/space/CMakeLists.txt deleted file mode 100644 index a2c419d130..0000000000 --- a/space/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -cmake_minimum_required(VERSION 2.8) - -project(space) - -file(GLOB SPACE_SRCS src/*.cpp src/*.h) - -add_executable(space ${SPACE_SRCS}) - -include(../cmake/macros/LinkHifiLibrary.cmake) -link_hifi_library(shared space) \ No newline at end of file