diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff9fbe9244..7052276956 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,8 +14,12 @@ include("cmake/init.cmake")
 include("cmake/compiler.cmake")
 
 if (BUILD_SCRIBE_ONLY)
-    add_subdirectory(tools/scribe)
-    return()
+  add_subdirectory(tools/scribe)
+  return()
+endif()
+
+if (NOT DEFINED CLIENT_ONLY)
+  set(CLIENT_ONLY 0)
 endif()
 
 if (NOT DEFINED SERVER_ONLY)
@@ -23,42 +27,52 @@ if (NOT DEFINED SERVER_ONLY)
 endif()
 
 if (ANDROID OR UWP)
-    set(MOBILE 1)
+  set(MOBILE 1)
 else()
-    set(MOBILE 0)
+  set(MOBILE 0)
 endif()
 
+set(BUILD_CLIENT_OPTION ON)
+set(BUILD_SERVER_OPTION ON)
+set(BUILD_TESTS_OPTION ON)
+set(BUILD_TOOLS_OPTION ON)
+set(BUILD_INSTALLER_OPTION ON)
+set(GLES_OPTION OFF)
+set(DISABLE_QML_OPTION OFF)
+
 if (ANDROID OR UWP)
-    option(BUILD_SERVER "Build server components" OFF)
-    option(BUILD_TOOLS "Build tools" OFF)
-    option(BUILD_INSTALLER "Build installer" OFF)
-else()
-    option(BUILD_SERVER "Build server components" ON)
-    option(BUILD_TOOLS "Build tools" ON)
-    option(BUILD_INSTALLER "Build installer" ON)
+  set(BUILD_SERVER_OPTION OFF)
+  set(BUILD_TOOLS_OPTION OFF)
+  set(BUILD_INSTALLER OFF)
+endif()
+
+if (CLIENT_ONLY)
+  set(BUILD_SERVER_OPTION OFF)
 endif()
 
 if (SERVER_ONLY)
-    option(BUILD_CLIENT "Build client components" OFF)
-    option(BUILD_TESTS "Build tests" OFF)
-else()
-    option(BUILD_CLIENT "Build client components" ON)
-    option(BUILD_TESTS "Build tests" ON)
+  set(BUILD_CLIENT_OPTION OFF)
+  set(BUILD_TESTS_OPTION OFF)
 endif()
 
 if (ANDROID)
-    option(USE_GLES "Use OpenGL ES" ON)
-    set(PLATFORM_QT_COMPONENTS AndroidExtras WebView)
+  set(GLES_OPTION ON)
+  set(PLATFORM_QT_COMPONENTS AndroidExtras WebView)
 else ()
-    option(USE_GLES "Use OpenGL ES" OFF)
-    set(PLATFORM_QT_COMPONENTS WebEngine WebEngineWidgets)
+  set(PLATFORM_QT_COMPONENTS WebEngine WebEngineWidgets)
 endif ()
 
 if (USE_GLES AND (NOT ANDROID))
-    option(DISABLE_QML "Disable QML" ON)
-else()
-    option(DISABLE_QML "Disable QML" OFF)
+  set(DISABLE_QML_OPTION ON)
 endif()
+
+option(BUILD_CLIENT "Build client components" ${BUILD_CLIENT_OPTION})
+option(BUILD_SERVER "Build server components" ${BUILD_SERVER_OPTION})
+option(BUILD_TESTS "Build tests" ${BUILD_TESTS_OPTION})
+option(BUILD_TOOLS "Build tools" ${BUILD_TOOLS_OPTION})
+option(BUILD_INSTALLER "Build installer" ${BUILD_INSTALLER_OPTION})
+option(USE_GLES "Use OpenGL ES" ${GLES_OPTION})
+option(DISABLE_QML "Disable QML" ${DISABLE_QML_OPTION})
 option(DISABLE_KTX_CACHE "Disable KTX Cache" OFF)
 
 set(PLATFORM_QT_GL OpenGL)
@@ -70,12 +84,10 @@ else()
   set(PLATFORM_GL_BACKEND gpu-gl)
 endif()
 
-
 foreach(PLATFORM_QT_COMPONENT ${PLATFORM_QT_COMPONENTS})
   list(APPEND PLATFORM_QT_LIBRARIES "Qt5::${PLATFORM_QT_COMPONENT}")
 endforeach()
 
-
 MESSAGE(STATUS "Build server:    " ${BUILD_SERVER})
 MESSAGE(STATUS "Build client:    " ${BUILD_CLIENT})
 MESSAGE(STATUS "Build tests:     " ${BUILD_TESTS})
@@ -84,17 +96,17 @@ MESSAGE(STATUS "Build installer: " ${BUILD_INSTALLER})
 MESSAGE(STATUS "GL ES:           " ${USE_GLES})
 
 if (DISABLE_QML)
-MESSAGE(STATUS "QML disabled!")
-add_definitions(-DDISABLE_QML)
+  MESSAGE(STATUS "QML disabled!")
+  add_definitions(-DDISABLE_QML)
 endif()
 
 if (DISABLE_KTX_CACHE)
-MESSAGE(STATUS "KTX cache disabled!")
-add_definitions(-DDISABLE_KTX_CACHE)
+  MESSAGE(STATUS "KTX cache disabled!")
+  add_definitions(-DDISABLE_KTX_CACHE)
 endif()
 
 if (UNIX AND DEFINED ENV{HIFI_MEMORY_DEBUGGING})
-    MESSAGE(STATUS "Memory debugging is enabled")
+  MESSAGE(STATUS "Memory debugging is enabled")
 endif()
 
 #
@@ -160,16 +172,16 @@ endif()
 add_subdirectory(tools)
 
 if (BUILD_TESTS)
-    add_subdirectory(tests)
+  add_subdirectory(tests)
 endif()
 
 if (BUILD_INSTALLER)
-    if (UNIX)
-        install(
-            DIRECTORY "${CMAKE_SOURCE_DIR}/scripts"
-            DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/interface
-            COMPONENT ${CLIENT_COMPONENT}
-        )
-    endif()
-    generate_installers()
+  if (UNIX)
+    install(
+        DIRECTORY "${CMAKE_SOURCE_DIR}/scripts"
+        DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/interface
+        COMPONENT ${CLIENT_COMPONENT}
+    )
+  endif()
+  generate_installers()
 endif()
diff --git a/cmake/macros/GenerateInstallers.cmake b/cmake/macros/GenerateInstallers.cmake
index 032f83e8be..a263da677c 100644
--- a/cmake/macros/GenerateInstallers.cmake
+++ b/cmake/macros/GenerateInstallers.cmake
@@ -88,8 +88,13 @@ macro(GENERATE_INSTALLERS)
 
   set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
 
-  cpack_add_component(${CLIENT_COMPONENT} DISPLAY_NAME "High Fidelity Interface")
-  cpack_add_component(${SERVER_COMPONENT} DISPLAY_NAME "High Fidelity Sandbox")
+  if (BUILD_CLIENT)
+    cpack_add_component(${CLIENT_COMPONENT} DISPLAY_NAME "High Fidelity Interface")
+  endif ()
+
+  if (BUILD_SERVER)
+    cpack_add_component(${SERVER_COMPONENT} DISPLAY_NAME "High Fidelity Sandbox")
+  endif ()
 
   include(CPack)
 endmacro()
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 4ce35027f2..d98ac67dfd 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -26,17 +26,17 @@ generate_qrc(OUTPUT ${RESOURCES_QRC} PATH ${CMAKE_CURRENT_SOURCE_DIR}/resources
 if (ANDROID)
   # on Android, don't compress the rcc binary
   add_custom_command(
-      OUTPUT ${RESOURCES_RCC}
-      DEPENDS ${RESOURCES_QRC} ${GENERATE_QRC_DEPENDS}
-      COMMAND "${QT_DIR}/bin/rcc"
-      ARGS ${RESOURCES_QRC} -no-compress -binary -o ${RESOURCES_RCC}
+    OUTPUT ${RESOURCES_RCC}
+    DEPENDS ${RESOURCES_QRC} ${GENERATE_QRC_DEPENDS}
+    COMMAND "${QT_DIR}/bin/rcc"
+    ARGS ${RESOURCES_QRC} -no-compress -binary -o ${RESOURCES_RCC}
   )
 else ()
   add_custom_command(
-      OUTPUT ${RESOURCES_RCC}
-      DEPENDS ${RESOURCES_QRC} ${GENERATE_QRC_DEPENDS}
-      COMMAND "${QT_DIR}/bin/rcc"
-      ARGS ${RESOURCES_QRC} -binary -o ${RESOURCES_RCC}
+    OUTPUT ${RESOURCES_RCC}
+    DEPENDS ${RESOURCES_QRC} ${GENERATE_QRC_DEPENDS}
+    COMMAND "${QT_DIR}/bin/rcc"
+    ARGS ${RESOURCES_QRC} -binary -o ${RESOURCES_RCC}
   )
 endif()
 
@@ -203,12 +203,6 @@ if (WIN32)
   add_dependency_external_projects(steamworks)
 endif()
 
-# include OPENSSL
-include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}")
-
-# append OpenSSL to our list of libraries to link
-target_link_libraries(${TARGET_NAME} ${OPENSSL_LIBRARIES})
-
 # disable /OPT:REF and /OPT:ICF for the Debug builds
 # This will prevent the following linker warnings
 # LINK : warning LNK4075: ignoring '/INCREMENTAL' due to '/OPT:ICF' specification
@@ -232,6 +226,9 @@ link_hifi_libraries(
 # include the binary directory of render-utils for shader includes
 target_include_directories(${TARGET_NAME} PRIVATE "${CMAKE_BINARY_DIR}/libraries/render-utils")
 
+# include OpenSSL
+target_openssl()
+
 target_bullet()
 target_opengl()
 add_crashpad()
diff --git a/plugins/hifiCodec/CMakeLists.txt b/plugins/hifiCodec/CMakeLists.txt
index 28c1dc3807..9ecaf7b511 100644
--- a/plugins/hifiCodec/CMakeLists.txt
+++ b/plugins/hifiCodec/CMakeLists.txt
@@ -12,5 +12,7 @@ link_hifi_libraries(audio plugins)
 add_dependency_external_projects(hifiAudioCodec)
 target_include_directories(${TARGET_NAME} PRIVATE ${HIFIAUDIOCODEC_INCLUDE_DIRS})
 target_link_libraries(${TARGET_NAME} ${HIFIAUDIOCODEC_LIBRARIES})
-install_beside_console()
 
+if (BUILD_SERVER)
+  install_beside_console()
+endif ()
diff --git a/plugins/pcmCodec/CMakeLists.txt b/plugins/pcmCodec/CMakeLists.txt
index 900a642a88..cce33ecd1a 100644
--- a/plugins/pcmCodec/CMakeLists.txt
+++ b/plugins/pcmCodec/CMakeLists.txt
@@ -9,5 +9,7 @@
 set(TARGET_NAME pcmCodec)
 setup_hifi_client_server_plugin()
 link_hifi_libraries(shared plugins)
-install_beside_console()
 
+if (BUILD_SERVER)
+  install_beside_console()
+endif ()
diff --git a/tools/oven/CMakeLists.txt b/tools/oven/CMakeLists.txt
index 549414cbab..71bb997303 100644
--- a/tools/oven/CMakeLists.txt
+++ b/tools/oven/CMakeLists.txt
@@ -18,4 +18,6 @@ elseif (APPLE)
   set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH "@executable_path/../Frameworks")
 endif()
 
-install_beside_console()
+if (BUILD_SERVER)
+  install_beside_console()
+endif ()