blob: ed30dcf1a1f7b6319a0b6c41aa4567735432791f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
From fb9cbe559ac41226adda4d9c4aa8c454ea0455f2 Mon Sep 17 00:00:00 2001
From: soloturn <soloturn@gmail.com>
Date: Sat, 1 Aug 2020 16:21:07 +0200
Subject: [PATCH] arch aur pachtes
---
CMakeLists.txt | 1 +
docs/CMakeLists.txt | 1 -
utils/build-presets.ini | 6 +++---
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a84adb0ca46..43d8b885648 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -914,6 +914,7 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")
endif()
endif()
+find_package(Python2 COMPONENTS Interpreter)
find_package(Python3 COMPONENTS Interpreter REQUIRED)
#
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index c748bd36eba..eef2c349848 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -10,7 +10,6 @@ SET(SWIFT_SPHINX_PAPER_SIZE "letter"
CACHE STRING "Paper size for generated documentation")
SET(SPHINX_ARGS
- -W
-D latex_elements.papersize=${SWIFT_SPHINX_PAPER_SIZE}
-d ${CMAKE_BINARY_DIR}/doctrees)
diff --git a/utils/build-presets.ini b/utils/build-presets.ini
index b1fe751b1ac..3d67f7223aa 100644
--- a/utils/build-presets.ini
+++ b/utils/build-presets.ini
@@ -779,16 +779,17 @@ mixin-preset=
mixin_lightweight_assertions,no-stdlib-asserts
mixin_linux_install_components_with_clang
+extra-cmake-options=
+ -DCMAKE_IGNORE_PATH="/usr/include/bits"
+
llbuild
swiftpm
swift-driver
xctest
-libicu
libcxx
dash-dash
-build-ninja
install-llvm
install-swift
install-lldb
@@ -796,7 +797,6 @@ install-llbuild
install-swiftpm
install-swift-driver
install-xctest
-install-libicu
install-prefix=/usr
install-libcxx
install-sourcekit-lsp
--
2.28.0
|