From 406b08ffa13bce3536cbde7917d33790c68601c2 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Wed, 20 Jul 2016 11:29:00 -0700 Subject: [PATCH] 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()