From 2d000e395ecc275b0aceeff942db71dad86fbf79 Mon Sep 17 00:00:00 2001 From: Jan Korous Date: Tue, 26 Mar 2019 03:48:25 +0000 Subject: [PATCH] [clangd][xpc][cmake] Respect explicit value of CLANGD_BUILD_XPC We shouldn't prevent user from disabling XPC framework build on Darwin. However, by keeping it on by default our CI systems also test it by default on macOS. Based on user request: http://lists.llvm.org/pipermail/cfe-dev/2019-March/061778.html Differential Revision: https://reviews.llvm.org/D59808 llvm-svn: 356974 --- clang-tools-extra/CMakeLists.txt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/clang-tools-extra/CMakeLists.txt b/clang-tools-extra/CMakeLists.txt index 66ebeaeeaa32..514b17fb3c0c 100644 --- a/clang-tools-extra/CMakeLists.txt +++ b/clang-tools-extra/CMakeLists.txt @@ -1,6 +1,13 @@ -option(CLANGD_BUILD_XPC "Build XPC Support For Clangd." OFF) -if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - set(CLANGD_BUILD_XPC ON CACHE BOOL "" FORCE) +if (NOT DEFINED CLANGD_BUILD_XPC) + if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(CLANGD_BUILD_XPC_DEFAULT ON) + else () + set(CLANGD_BUILD_XPC_DEFAULT OFF) + endif () + + set(CLANGD_BUILD_XPC ${CLANGD_BUILD_XPC_DEFAULT} CACHE BOOL "Build XPC Support For Clangd." FORCE) + + unset(CLANGD_BUILD_XPC_DEFAULT) endif () add_subdirectory(clang-apply-replacements)