File tree 3 files changed +13
-3
lines changed
3 files changed +13
-3
lines changed Original file line number Diff line number Diff line change @@ -210,6 +210,9 @@ if (CLANGD_ENABLE_REMOTE)
210
210
include (AddGRPC)
211
211
endif ()
212
212
213
+ option (CLANGD_BUILD_DEXP "Build the dexp tool as part of Clangd" ON )
214
+ llvm_canonicalize_cmake_booleans(CLANGD_BUILD_DEXP)
215
+
213
216
if (CLANG_INCLUDE_TESTS)
214
217
add_subdirectory (test )
215
218
add_subdirectory (unittests)
@@ -220,4 +223,7 @@ option(CLANGD_ENABLE_REMOTE "Use gRPC library to enable remote index support for
220
223
set (GRPC_INSTALL_PATH "" CACHE PATH "Path to gRPC library manual installation." )
221
224
222
225
add_subdirectory (index/remote)
223
- add_subdirectory (index/dex/dexp)
226
+
227
+ if (CLANGD_BUILD_DEXP)
228
+ add_subdirectory (index/dex/dexp)
229
+ endif ()
Original file line number Diff line number Diff line change @@ -3,15 +3,18 @@ set(CLANGD_TEST_DEPS
3
3
ClangdTests
4
4
clangd-indexer
5
5
split-file
6
- # No tests for it, but we should still make sure they build.
7
- dexp
8
6
)
9
7
10
8
if (CLANGD_BUILD_XPC)
11
9
list (APPEND CLANGD_TEST_DEPS clangd-xpc-test -client)
12
10
list (APPEND CLANGD_TEST_DEPS ClangdXpcUnitTests)
13
11
endif ()
14
12
13
+ if (CLANGD_BUILD_DEXP)
14
+ # No tests for it, but we should still make sure they build.
15
+ list (APPEND CLANGD_TEST_DEPS dexp)
16
+ endif ()
17
+
15
18
if (CLANGD_ENABLE_REMOTE)
16
19
list (APPEND CLANGD_TEST_DEPS clangd-index-server clangd-index-server-monitor)
17
20
endif ()
Original file line number Diff line number Diff line change @@ -15,6 +15,7 @@ config.llvm_shlib_dir = "@SHLIBDIR@"
15
15
config.clangd_source_dir = "@CMAKE_CURRENT_SOURCE_DIR@/.."
16
16
config.clangd_binary_dir = "@CMAKE_CURRENT_BINARY_DIR@/.."
17
17
config.clangd_build_xpc = @CLANGD_BUILD_XPC@
18
+ config.clangd_build_dexp = @CLANGD_BUILD_DEXP@
18
19
config.clangd_enable_remote = @CLANGD_ENABLE_REMOTE@
19
20
config.clangd_tidy_checks = @CLANGD_TIDY_CHECKS@
20
21
config.have_zlib = @LLVM_ENABLE_ZLIB@
You can’t perform that action at this time.
0 commit comments