File tree Expand file tree Collapse file tree 4 files changed +11
-9
lines changed Expand file tree Collapse file tree 4 files changed +11
-9
lines changed Original file line number Diff line number Diff line change 1
1
[submodule "extern/drgn "]
2
2
path = extern/drgn
3
3
url = https://github.com/ajor/drgn.git
4
- [submodule "extern/folly "]
5
- path = extern/folly
6
- url = https://github.com/JakeHillion/folly.git
Original file line number Diff line number Diff line change @@ -112,6 +112,16 @@ add_custom_target(librocksdb ALL
112
112
)
113
113
include_directories (SYSTEM "${rocksdb_SOURCE_DIR} /include" )
114
114
115
+ ### folly
116
+ ### use folly as a header only library. some features won't be supported.
117
+ FetchContent_Declare(
118
+ folly
119
+ GIT_REPOSITORY https://github.com/JakeHillion/folly.git
120
+ GIT_TAG 8db54418e3ccdd97619ac8b69bb3702f82bb0f66
121
+ )
122
+ FetchContent_Populate(folly)
123
+ include_directories (SYSTEM ${folly_SOURCE_DIR} )
124
+
115
125
### bison & flex (for oid_parser)
116
126
find_package (BISON 3.5 REQUIRED)
117
127
find_package (FLEX)
@@ -147,10 +157,6 @@ find_package(msgpack REQUIRED CONFIG)
147
157
get_target_property (MSGPACK_INCLUDE_DIRS msgpackc INTERFACE_INCLUDE_DIRECTORIES )
148
158
include_directories (SYSTEM ${MSGPACK_INCLUDE_DIRS} )
149
159
150
- ### folly
151
- ### use folly as a header only library. some features won't be supported.
152
- include_directories (SYSTEM ${CMAKE_CURRENT_SOURCE_DIR} /extern/folly)
153
-
154
160
### zstd (for rocksdb)
155
161
find_package (zstd REQUIRED)
156
162
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -45,7 +45,7 @@ containers = [
45
45
46
46
[headers ]
47
47
user_paths = [
48
- " ../extern/ folly" ,
48
+ " _deps/ folly-src " , # this path might be flaky, but it's unlikely to change
49
49
]
50
50
system_paths = [
51
51
" /usr/include/c++/11" ,
You can’t perform that action at this time.
0 commit comments