diff --git a/cmake/macros/LinkHifiLibrary.cmake b/cmake/macros/LinkHifiLibrary.cmake
index 6aaf784437..6a4122d583 100644
--- a/cmake/macros/LinkHifiLibrary.cmake
+++ b/cmake/macros/LinkHifiLibrary.cmake
@@ -3,12 +3,6 @@ MACRO(LINK_HIFI_LIBRARY LIBRARY TARGET ROOT_DIR)
         add_subdirectory(${ROOT_DIR}/libraries/${LIBRARY} ${ROOT_DIR}/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 ${ROOT_DIR}/libraries/${LIBRARY} 
-                           DEFINITION ${HIFI_LIBRARY_PROPERTY})
-    
     include_directories(${ROOT_DIR}/libraries/${LIBRARY}/src)
 
     add_dependencies(${TARGET} ${LIBRARY})
diff --git a/cmake/macros/SetupHifiLibrary.cmake b/cmake/macros/SetupHifiLibrary.cmake
new file mode 100644
index 0000000000..156ca186b2
--- /dev/null
+++ b/cmake/macros/SetupHifiLibrary.cmake
@@ -0,0 +1,9 @@
+MACRO(SETUP_HIFI_LIBRARY TARGET)
+    project(${TARGET_NAME})
+
+    # grab the implemenation and header files
+    file(GLOB LIB_SRCS src/*.h src/*.cpp)
+
+    # create a library and set the property so it can be referenced later
+    add_library(${TARGET_NAME} ${LIB_SRCS})
+ENDMACRO(SETUP_HIFI_LIBRARY _target)
\ No newline at end of file
diff --git a/libraries/voxels/CMakeLists.txt b/libraries/voxels/CMakeLists.txt
index 21188c26f9..4a6aea05b2 100644
--- a/libraries/voxels/CMakeLists.txt
+++ b/libraries/voxels/CMakeLists.txt
@@ -8,19 +8,13 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cm
 
 set(TARGET_NAME voxels)
 
-project(${TARGET_NAME})
+include(${MACRO_DIR}/SetupHifiLibrary.cmake)
+setup_hifi_library(${TARGET_NAME})
 
-# set up the external glm library
+# include glm
 include(${MACRO_DIR}/IncludeGLM.cmake)
 include_glm(${TARGET_NAME} ${MACRO_DIR})
 
-# grab the implemenation and header files
-file(GLOB HIFI_VOXELS_SRCS src/*.h src/*.cpp)
-
-# create a library and set the property so it can be referenced later
-add_library(${TARGET_NAME} ${HIFI_VOXELS_SRCS})
-
+# link the shared library
 include(${MACRO_DIR}/LinkHifiLibrary.cmake)
-link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
-
-set(HIFI_VOXELS_LIBRARY ${TARGET_NAME})
\ No newline at end of file
+link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
\ No newline at end of file