tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1From 61c9b97d7b81cc2c013b423bf1763a92b14fcae3 Mon Sep 17 00:00:00 2001
2From: Jan Korous <jkorous@apple.com>
3Date: Tue, 26 Mar 2019 03:48:25 +0000
4Subject: [PATCH] [clangd][xpc][cmake] Respect explicit value of
5 CLANGD_BUILD_XPC
6
7We shouldn't prevent user from disabling XPC framework build on Darwin.
8However, by keeping it on by default our CI systems also test
9it by default on macOS.
10
11Based on user request:
12http://lists.llvm.org/pipermail/cfe-dev/2019-March/061778.html
13
14Differential Revision: https://reviews.llvm.org/D59808
15
16git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@356974 91177308-0d34-0410-b5e6-96231b3b80d8
17---
18 CMakeLists.txt | 13 ++++++++++---
19 1 file changed, 10 insertions(+), 3 deletions(-)
20
21diff --git a/CMakeLists.txt b/CMakeLists.txt
22index 66ebeaeeaa..514b17fb3c 100644
23--- a/tools/extra/CMakeLists.txt
24+++ b/tools/extra/CMakeLists.txt
25@@ -1,6 +1,13 @@
26-option(CLANGD_BUILD_XPC "Build XPC Support For Clangd." OFF)
27-if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
28- set(CLANGD_BUILD_XPC ON CACHE BOOL "" FORCE)
29+if (NOT DEFINED CLANGD_BUILD_XPC)
30+ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
31+ set(CLANGD_BUILD_XPC_DEFAULT ON)
32+ else ()
33+ set(CLANGD_BUILD_XPC_DEFAULT OFF)
34+ endif ()
35+
36+ set(CLANGD_BUILD_XPC ${CLANGD_BUILD_XPC_DEFAULT} CACHE BOOL "Build XPC Support For Clangd." FORCE)
37+
38+ unset(CLANGD_BUILD_XPC_DEFAULT)
39 endif ()
40
41 add_subdirectory(clang-apply-replacements)