Merge remote-tracking branch 'origin/3.0' into feature/dnode3

This commit is contained in:
Shengliang Guan 2021-09-30 12:01:37 +08:00
commit 31b3fbd77c
1 changed files with 2 additions and 1 deletions

3
deps/CMakeLists.txt vendored
View File

@ -5,7 +5,8 @@ endif(${BUILD_TEST})
add_subdirectory(cJson)
target_include_directories(
cjson
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/cJson
# see https://stackoverflow.com/questions/25676277/cmake-target-include-directories-prints-an-error-when-i-try-to-add-the-source
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cJson>
)
add_subdirectory(lz4/build/cmake)
add_subdirectory(zlib)