From 406b08ffa13bce3536cbde7917d33790c68601c2 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Wed, 20 Jul 2016 11:29:00 -0700
Subject: [PATCH 1/4] when cmake is told SERVER_ONLY, still build server-side
 plugins

---
 CMakeLists.txt         |  2 +-
 plugins/CMakeLists.txt | 27 ++++++++++++++++++++++-----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0922779bc6..0d42be3d95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -226,8 +226,8 @@ if (NOT ANDROID)
     add_subdirectory(interface)
     set_target_properties(interface PROPERTIES FOLDER "Apps")
     add_subdirectory(tests)
-    add_subdirectory(plugins)
   endif()
+  add_subdirectory(plugins)
   add_subdirectory(tools)
 endif()
 
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 55b18b122c..7185fda3f7 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -10,9 +10,26 @@
 file(GLOB PLUGIN_SUBDIRS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/*")
 list(REMOVE_ITEM PLUGIN_SUBDIRS "CMakeFiles")
 
-foreach(DIR ${PLUGIN_SUBDIRS})
-  if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${DIR}")
-    add_subdirectory(${DIR})
-  endif()
-endforeach()
+# client-side plugins
+if (NOT SERVER_ONLY)
+  set(DIR "oculus")          add_subdirectory(${DIR})
+  set(DIR "hifiSdl2")        add_subdirectory(${DIR})
+  set(DIR "openvr")          add_subdirectory(${DIR})
+  set(DIR "oculusLegacy")    add_subdirectory(${DIR})
+  set(DIR "hifiSixense")     add_subdirectory(${DIR})
+  set(DIR "hifiSpacemouse")  add_subdirectory(${DIR})
+  set(DIR "hifiNeuron")      add_subdirectory(${DIR})
+endif()
+
+# server-side plugins
+set(DIR "pcmCodec")   add_subdirectory(${DIR})
+set(DIR "hifiCodec")  add_subdirectory(${DIR})
+
+
+# foreach(DIR ${PLUGIN_SUBDIRS})
+#   if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${DIR}")
+#     add_subdirectory(${DIR})
+#     message("XXXXXXXXXXXXXXXXX" ${DIR})
+#   endif()
+# endforeach()
 

From c36d0d91add46811587d96943adf3f0e79753024 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Wed, 20 Jul 2016 11:29:57 -0700
Subject: [PATCH 2/4] when cmake is told SERVER_ONLY, still build server-side
 plugins

---
 plugins/CMakeLists.txt | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 7185fda3f7..f766f32efe 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -12,18 +12,27 @@ list(REMOVE_ITEM PLUGIN_SUBDIRS "CMakeFiles")
 
 # client-side plugins
 if (NOT SERVER_ONLY)
-  set(DIR "oculus")          add_subdirectory(${DIR})
-  set(DIR "hifiSdl2")        add_subdirectory(${DIR})
-  set(DIR "openvr")          add_subdirectory(${DIR})
-  set(DIR "oculusLegacy")    add_subdirectory(${DIR})
-  set(DIR "hifiSixense")     add_subdirectory(${DIR})
-  set(DIR "hifiSpacemouse")  add_subdirectory(${DIR})
-  set(DIR "hifiNeuron")      add_subdirectory(${DIR})
+  set(DIR "oculus")
+  add_subdirectory(${DIR})
+  set(DIR "hifiSdl2")
+  add_subdirectory(${DIR})
+  set(DIR "openvr")
+  add_subdirectory(${DIR})
+  set(DIR "oculusLegacy")
+  add_subdirectory(${DIR})
+  set(DIR "hifiSixense")
+  add_subdirectory(${DIR})
+  set(DIR "hifiSpacemouse")
+  add_subdirectory(${DIR})
+  set(DIR "hifiNeuron")
+  add_subdirectory(${DIR})
 endif()
 
 # server-side plugins
-set(DIR "pcmCodec")   add_subdirectory(${DIR})
-set(DIR "hifiCodec")  add_subdirectory(${DIR})
+set(DIR "pcmCodec")
+add_subdirectory(${DIR})
+set(DIR "hifiCodec")
+add_subdirectory(${DIR})
 
 
 # foreach(DIR ${PLUGIN_SUBDIRS})

From 5485b3ee13244ef4b8973b33e55ef79a42a3c678 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Wed, 20 Jul 2016 11:34:44 -0700
Subject: [PATCH 3/4] when cmake is told SERVER_ONLY, still build server-side
 plugins

---
 cmake/macros/SetupHifiClientServerPlugin.cmake | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cmake/macros/SetupHifiClientServerPlugin.cmake b/cmake/macros/SetupHifiClientServerPlugin.cmake
index 74ceaeb0ab..0ce7796756 100644
--- a/cmake/macros/SetupHifiClientServerPlugin.cmake
+++ b/cmake/macros/SetupHifiClientServerPlugin.cmake
@@ -8,7 +8,9 @@
 macro(SETUP_HIFI_CLIENT_SERVER_PLUGIN)
     set(${TARGET_NAME}_SHARED 1)
     setup_hifi_library(${ARGV})
-    add_dependencies(interface ${TARGET_NAME})
+    if (NOT DEFINED SERVER_ONLY)
+      add_dependencies(interface ${TARGET_NAME})
+    endif()
     set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Plugins")
 
     if (APPLE)

From 4e308914b2efa62a5dfcc6f5a6e3d8d074dbe7bd Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Wed, 20 Jul 2016 11:37:30 -0700
Subject: [PATCH 4/4] when cmake is told SERVER_ONLY, still build server-side
 plugins

---
 plugins/CMakeLists.txt | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index f766f32efe..1e2a672107 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -33,12 +33,3 @@ set(DIR "pcmCodec")
 add_subdirectory(${DIR})
 set(DIR "hifiCodec")
 add_subdirectory(${DIR})
-
-
-# foreach(DIR ${PLUGIN_SUBDIRS})
-#   if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${DIR}")
-#     add_subdirectory(${DIR})
-#     message("XXXXXXXXXXXXXXXXX" ${DIR})
-#   endif()
-# endforeach()
-