diff --git a/cmake/macros/SetupHifiClientServerPlugin.cmake b/cmake/macros/SetupHifiClientServerPlugin.cmake
index 0ce7796756..37b000efb5 100644
--- a/cmake/macros/SetupHifiClientServerPlugin.cmake
+++ b/cmake/macros/SetupHifiClientServerPlugin.cmake
@@ -6,56 +6,60 @@
 #  See the accompanying file LICENSE or http:#www.apache.org/licenses/LICENSE-2.0.html
 #
 macro(SETUP_HIFI_CLIENT_SERVER_PLUGIN)
-    set(${TARGET_NAME}_SHARED 1)
-    setup_hifi_library(${ARGV})
-    if (NOT DEFINED SERVER_ONLY)
-      add_dependencies(interface ${TARGET_NAME})
-    endif()
-    set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Plugins")
+  set(${TARGET_NAME}_SHARED 1)
+  setup_hifi_library(${ARGV})
 
-    if (APPLE)
-        set(CLIENT_PLUGIN_PATH "${INTERFACE_BUNDLE_NAME}.app/Contents/PlugIns")
-        set(SERVER_PLUGIN_PATH "plugins")
-    else()
-        set(CLIENT_PLUGIN_PATH "plugins")
-        set(SERVER_PLUGIN_PATH "plugins")
-    endif()
+  if (NOT DEFINED SERVER_ONLY)
+    add_dependencies(interface ${TARGET_NAME})
+  endif()
 
-    if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_GENERATOR STREQUAL "Unix Makefiles")
-        set(CLIENT_PLUGIN_FULL_PATH "${CMAKE_BINARY_DIR}/interface/${CLIENT_PLUGIN_PATH}/")
-        set(SERVER_PLUGIN_FULL_PATH "${CMAKE_BINARY_DIR}/assignment-client/${SERVER_PLUGIN_PATH}/")
-    elseif (APPLE)
-        set(CLIENT_PLUGIN_FULL_PATH "${CMAKE_BINARY_DIR}/interface/$<CONFIGURATION>/${CLIENT_PLUGIN_PATH}/")
-        set(SERVER_PLUGIN_FULL_PATH "${CMAKE_BINARY_DIR}/assignment-client/$<CONFIGURATION>/${SERVER_PLUGIN_PATH}/")
-    else()
-        set(CLIENT_PLUGIN_FULL_PATH "${CMAKE_BINARY_DIR}/interface/$<CONFIGURATION>/${CLIENT_PLUGIN_PATH}/")
-        set(SERVER_PLUGIN_FULL_PATH "${CMAKE_BINARY_DIR}/assignment-client/$<CONFIGURATION>/${SERVER_PLUGIN_PATH}/")
-    endif()
+  add_dependencies(assignment-client ${TARGET_NAME})
 
-    # create the destination for the client plugin binaries
-    add_custom_command(
-        TARGET ${TARGET_NAME} POST_BUILD
-        COMMAND "${CMAKE_COMMAND}" -E make_directory
-        ${CLIENT_PLUGIN_FULL_PATH}
-    )
-    # copy the client plugin binaries
-    add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
-        COMMAND "${CMAKE_COMMAND}" -E copy
-        "$<TARGET_FILE:${TARGET_NAME}>"
-        ${CLIENT_PLUGIN_FULL_PATH}
-    )
+  set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Plugins")
 
-    # create the destination for the server plugin binaries
-    add_custom_command(
-        TARGET ${TARGET_NAME} POST_BUILD
-        COMMAND "${CMAKE_COMMAND}" -E make_directory
-        ${SERVER_PLUGIN_FULL_PATH}
-    )
-    # copy the server plugin binaries
-    add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
-        COMMAND "${CMAKE_COMMAND}" -E copy
-        "$<TARGET_FILE:${TARGET_NAME}>"
-        ${SERVER_PLUGIN_FULL_PATH}
-    )
+  if (APPLE)
+    set(CLIENT_PLUGIN_PATH "${INTERFACE_BUNDLE_NAME}.app/Contents/PlugIns")
+    set(SERVER_PLUGIN_PATH "plugins")
+  else()
+    set(CLIENT_PLUGIN_PATH "plugins")
+    set(SERVER_PLUGIN_PATH "plugins")
+  endif()
+
+  if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_GENERATOR STREQUAL "Unix Makefiles")
+    set(CLIENT_PLUGIN_FULL_PATH "${CMAKE_BINARY_DIR}/interface/${CLIENT_PLUGIN_PATH}/")
+    set(SERVER_PLUGIN_FULL_PATH "${CMAKE_BINARY_DIR}/assignment-client/${SERVER_PLUGIN_PATH}/")
+  elseif (APPLE)
+    set(CLIENT_PLUGIN_FULL_PATH "${CMAKE_BINARY_DIR}/interface/$<CONFIGURATION>/${CLIENT_PLUGIN_PATH}/")
+    set(SERVER_PLUGIN_FULL_PATH "${CMAKE_BINARY_DIR}/assignment-client/$<CONFIGURATION>/${SERVER_PLUGIN_PATH}/")
+  else()
+    set(CLIENT_PLUGIN_FULL_PATH "${CMAKE_BINARY_DIR}/interface/$<CONFIGURATION>/${CLIENT_PLUGIN_PATH}/")
+    set(SERVER_PLUGIN_FULL_PATH "${CMAKE_BINARY_DIR}/assignment-client/$<CONFIGURATION>/${SERVER_PLUGIN_PATH}/")
+  endif()
+
+  # create the destination for the client plugin binaries
+  add_custom_command(
+    TARGET ${TARGET_NAME} POST_BUILD
+    COMMAND "${CMAKE_COMMAND}" -E make_directory
+    ${CLIENT_PLUGIN_FULL_PATH}
+  )
+  # copy the client plugin binaries
+  add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
+    COMMAND "${CMAKE_COMMAND}" -E copy
+    "$<TARGET_FILE:${TARGET_NAME}>"
+    ${CLIENT_PLUGIN_FULL_PATH}
+  )
+
+  # create the destination for the server plugin binaries
+  add_custom_command(
+    TARGET ${TARGET_NAME} POST_BUILD
+    COMMAND "${CMAKE_COMMAND}" -E make_directory
+    ${SERVER_PLUGIN_FULL_PATH}
+  )
+  # copy the server plugin binaries
+  add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
+    COMMAND "${CMAKE_COMMAND}" -E copy
+    "$<TARGET_FILE:${TARGET_NAME}>"
+    ${SERVER_PLUGIN_FULL_PATH}
+  )
 
 endmacro()