Skip to content

Commit bf25a54

Browse files
authored
Update the submodule link to wiki to the tip of the master branch. (#2393)
Added "uuid" to "getCollections" in Replicator-Protocol.md - Also fixed bugs in platform_unix.cmake and LiteCore/tests/CMakeLists.txt
1 parent bc64a4d commit bf25a54

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

LiteCore/tests/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,13 +179,19 @@ target_include_directories(
179179
${TOP}vendor/vector_search
180180
)
181181

182+
if(APPLE OR ANDROID)
183+
set(ConditionalP2P $<$<BOOL:${BUILD_ENTERPRISE}>:LiteCoreP2P>)
184+
else()
185+
set(ConditionalP2P "")
186+
endif()
187+
182188
target_link_libraries(
183189
CppTests PRIVATE
184190
LiteCoreUnitTesting
185191
FleeceObjects
186192
BLIPObjects
187193
LiteCoreREST_Objects
188-
$<$<BOOL:${BUILD_ENTERPRISE}>:LiteCoreP2P>
194+
${ConditionalP2P}
189195
$<$<BOOL:${BUILD_ENTERPRISE}>:LiteCoreListener_Static>
190196
LiteCoreWebSocket
191197
)

cmake/platform_unix.cmake

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,11 @@ function(setup_litecore_build_unix)
178178
)
179179
endforeach()
180180
if (BUILD_ENTERPRISE)
181-
foreach(target LiteCoreListener_Objects LiteCoreP2P)
181+
set(targets LiteCoreListener_Objects)
182+
if (ANDROID)
183+
list(APPEND targets LiteCoreP2P)
184+
endif()
185+
foreach(target ${targets})
182186
target_compile_options(${target} PRIVATE
183187
${LITECORE_COMPILE_OPTIONS}
184188
${LITECORE_WARNINGS}

wiki

Submodule wiki updated from 01127ff to b36955f

0 commit comments

Comments
 (0)