Merge branch 'master' of https://github.com/worklist/hifi

CMakeLists.txt

@@ -2,10 +2,10 @@ cmake_minimum_required(VERSION 2.8)
 
 project(hifi)
 
-add_subdirectory(space)
-add_subdirectory(avatar)
-add_subdirectory(domain)
-add_subdirectory(mixer)
-add_subdirectory(voxel)
+add_subdirectory(avatar-mixer)
+add_subdirectory(audio-mixer)
+add_subdirectory(domain-server)
 add_subdirectory(interface)
 add_subdirectory(injector)
+add_subdirectory(space-server)
+add_subdirectory(voxel-server)

LinkHifiShared.cmake

@@ -1,15 +0,0 @@
-MACRO(LINK_HIFI_SHARED_LIBRARY TARGET)
-    if (NOT TARGET HifiShared)
-        add_subdirectory(../shared ../shared)
-    endif (NOT TARGET HifiShared)
-    
-    include_directories(../shared/src)
-    get_directory_property(HIFI_SHARED_LIBRARY DIRECTORY ../shared DEFINITION HIFI_SHARED_LIBRARY)
-    add_dependencies(${TARGET} ${HIFI_SHARED_LIBRARY})
-    target_link_libraries(${TARGET} ${HIFI_SHARED_LIBRARY})
-    
-    if (APPLE)
-      # link in required OS X framework
-      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework CoreServices")
-    endif (APPLE)
-ENDMACRO(LINK_HIFI_SHARED_LIBRARY _target)

audio-mixer/CMakeLists.txt

@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 2.8)
+set(MACRO_DIR ../cmake/macros)
+
+set(TARGET_NAME audio-mixer)
+
+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})
+
+# link the threads library
+find_package(Threads REQUIRED)
+target_link_libraries(${TARGET_NAME} ${CMAKE_THREAD_LIBS_INIT})

avatar-mixer/CMakeLists.txt

@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 2.8)
+
+set(TARGET_NAME "avatar-mixer")
+
+# setup the project
+include(../cmake/macros/SetupHifiProject.cmake)
+setup_hifi_project(${TARGET_NAME})
+
+# link the shared hifi library
+include(../cmake/macros/LinkHifiLibrary.cmake)
+link_hifi_library(shared ${TARGET_NAME})
+
+# link the threads library
+find_package(Threads REQUIRED)
+target_link_libraries(${TARGET_NAME} ${CMAKE_THREAD_LIBS_INIT})

avatar/CMakeLists.txt

@@ -1,17 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-project(avatar)
-
-# grab the implemenation and header files
-file(GLOB AVATAR_SRCS src/*.cpp src/*.h)
-
-# add the executable
-add_executable(avatar ${AVATAR_SRCS})
-
-# link the shared hifi library
-include(../LinkHifiShared.cmake)
-link_hifi_shared_library(avatar)
-
-# link the threads library
-find_package(Threads REQUIRED)
-target_link_libraries(avatar ${CMAKE_THREAD_LIBS_INIT})

cmake/macros/IncludeGLM.cmake

@@ -0,0 +1,5 @@
+MACRO(INCLUDE_GLM TARGET MACRO_DIR)
+	set(GLM_ROOT_DIR ${MACRO_DIR}/../../externals)
+	find_package(GLM REQUIRED)
+	include_directories(${GLM_INCLUDE_DIRS})
+ENDMACRO(INCLUDE_GLM _target _macro_dir)

cmake/macros/LinkHifiLibrary.cmake

@@ -0,0 +1,22 @@
+MACRO(LINK_HIFI_LIBRARY LIBRARY TARGET)
+    if (NOT TARGET ${LIBRARY})
+        add_subdirectory(../libraries/${LIBRARY} ../libraries/${LIBRARY})
+    endif (NOT TARGET ${LIBRARY})
+    
+    string(TOUPPER ${LIBRARY} UPPERCASED_LIBRARY_NAME)
+    set(HIFI_LIBRARY_PROPERTY "HIFI_${UPPERCASED_LIBRARY_NAME}_LIBRARY")
+    get_directory_property(HIFI_LIBRARY 
+                           DIRECTORY ../libraries/${LIBRARY} 
+                           DEFINITION ${HIFI_LIBRARY_PROPERTY})
+    
+    include_directories(../libraries/${LIBRARY}/src)
+
+    add_dependencies(${TARGET} ${LIBRARY})
+    target_link_libraries(${TARGET} ${LIBRARY})
+    
+    if (APPLE)
+      # currently the "shared" library requires CoreServices    
+      # link in required OS X framework
+      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework CoreServices")
+    endif (APPLE)
+ENDMACRO(LINK_HIFI_LIBRARY _library _target)

cmake/macros/SetupHifiProject.cmake

@@ -0,0 +1,9 @@
+MACRO(SETUP_HIFI_PROJECT TARGET)
+    project(${TARGET})
+    
+    # grab the implemenation and header files
+    file(GLOB TARGET_SRCS src/*.cpp src/*.h)
+    
+    # add the executable
+    add_executable(${TARGET} ${TARGET_SRCS})
+ENDMACRO(SETUP_HIFI_PROJECT _target)

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})

domain/CMakeLists.txt

@@ -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(../LinkHifiShared.cmake)
-link_hifi_shared_library(domain)