File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -315,7 +315,9 @@ endif()
315315# used to ensure these C/C++ headers are not passed to the Swift compiler.
316316if (MSVC )
317317 add_compile_options (
318- $<$<COMPILE_LANGUAGE :CXX >:/FI "assert .h " /FI "string .h " /FI "stdint .h ">)
318+ $<$<COMPILE_LANGUAGE :CXX >:/FI "assert .h ">
319+ $<$<COMPILE_LANGUAGE :CXX >:/FI "string .h ">
320+ $<$<COMPILE_LANGUAGE :CXX >:/FI "stdint .h ">)
319321elseif (APPLE )
320322 add_compile_options (
321323 "$<$<COMPILE_LANGUAGE :CXX >:SHELL :-include assert .h >"
Original file line number Diff line number Diff line change @@ -21,6 +21,9 @@ endif()
2121if (DESKTOP AND MSVC )
2222set (patch_file
2323 ${CMAKE_CURRENT_LIST_DIR} /../../scripts/git/patches/leveldb/0001-leveldb-1.23-windows-paths.patch)
24+ set (leveldb_patch_cmd PATCH_COMMAND git apply ${patch_file} && git gc --aggressive)
25+ else ()
26+ set (leveldb_patch_cmd "" )
2427endif ()
2528
2629# This version must be kept in sync with the version in firestore.patch.txt.
@@ -42,5 +45,5 @@ ExternalProject_Add(
4245 INSTALL_COMMAND ""
4346 TEST_COMMAND ""
4447 HTTP_HEADER "${EXTERNAL_PROJECT_HTTP_HEADER} "
45- PATCH_COMMAND git apply ${patch_file} && git gc --aggressive
48+ ${leveldb_patch_cmd}
4649)
You can’t perform that action at this time.
0 commit comments