Merge pull request #31 from ZappoMan/voxel_lod_fixes

Moving around glm and other shared libs

avatar/CMakeLists.txt

@@ -9,7 +9,7 @@ file(GLOB AVATAR_SRCS src/*.cpp src/*.h)
 add_executable(avatar ${AVATAR_SRCS})
 
 # link the shared hifi library
-include(../LinkHifiShared.cmake)
+include(../cmake/macros/LinkHifiShared.cmake)
 link_hifi_shared_library(avatar)
 
 # link the threads library

cmake/macros/IncludeGLM.cmake

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

cmake/macros/LinkHifiVoxelLib.cmake

@@ -0,0 +1,16 @@
+MACRO(LINK_HIFI_VOXELLIB_LIBRARY TARGET)
+    if (NOT TARGET HifiVoxelLib)
+        add_subdirectory(../voxellib ../voxellib)
+    endif (NOT TARGET HifiVoxelLib)
+    
+    include_directories(../voxellib/src)
+    get_directory_property(HIFI_VOXELLIB_LIBRARY DIRECTORY ../voxellib DEFINITION HIFI_VOXELLIB_LIBRARY)
+    add_dependencies(${TARGET} ${HIFI_VOXELLIB_LIBRARY})
+    target_link_libraries(${TARGET} ${HIFI_VOXELLIB_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_VOXELLIB_LIBRARY _target)

domain/CMakeLists.txt

@@ -9,5 +9,5 @@ file(GLOB DOMAIN_SRCS src/*.cpp src/*.h)
 add_executable(domain ${DOMAIN_SRCS})
 
 # link the shared hifi library
-include(../LinkHifiShared.cmake)
+include(../cmake/macros/LinkHifiShared.cmake)
 link_hifi_shared_library(domain)