From 6b18011a972d2dd568ab931225b27963852c5b25 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Tue, 6 Apr 2021 12:34:13 +1200 Subject: [PATCH] Don't include screenshare app in OSX client-only build --- CMakeLists.txt | 5 ++++- interface/CMakeLists.txt | 11 +++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8065244558..d9605fc734 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -316,7 +316,10 @@ endif() if (BUILD_CLIENT) add_subdirectory(interface) - add_subdirectory(screenshare) + if (NOT APPLE OR NOT CLIENT_ONLY) + # Don't include Screenshare in OSX client-only builds. + add_subdirectory(screenshare) + endif() if (APPLE) set_target_properties(Vircadia PROPERTIES FOLDER "Apps") else() diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index a8ae3ddbf6..a62f6d1231 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -196,10 +196,17 @@ if (BUILD_TOOLS AND NPM_EXECUTABLE) add_dependencies(resources jsdoc) endif() -if (WIN32 OR APPLE) - add_dependencies(${TARGET_NAME} resources screenshare) +if (WIN32) + add_dependencies(${TARGET_NAME} resources screenshare) endif() +if (APPLE) + add_dependencies(${TARGET_NAME} resources) + # Don't include Screenshare in OSX client-only builds. + if (NOT CLIENT_ONLY) + add_dependencies(${TARGET_NAME} screenshare) + endif() +endif() if (WIN32) # These are external plugins, but we need to do the 'add dependency' here so that their