Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Sync from Piper @acozzette/proto_github_202203101748

Browse Source 
PROTOBUF_SYNC_PIPER
pull/9652/head
Adam Cozzette 3 years ago
parent b20209f321
commit 1ddad63dd9
2 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      cmake/libprotobuf-lite.cmake
  2. 2
      cmake/libprotobuf.cmake

2
cmake/libprotobuf-lite.cmake
Unescape View File

@ -107,7 +107,7 @@ if(protobuf_LINK_LIBATOMIC)
target_link_libraries(libprotobuf-lite PRIVATE atomic) target_link_libraries(libprotobuf-lite PRIVATE atomic)
endif() endif()
if(${CMAKE_SYSTEM_NAME} STREQUAL "Android") if(${CMAKE_SYSTEM_NAME} STREQUAL "Android")
target_link_libraries(libprotobuf-lite PRIVATE log) target_link_libraries(libprotobuf-lite PRIVATE log)
endif() endif()
target_include_directories(libprotobuf-lite PUBLIC ${protobuf_SOURCE_DIR}/src) target_include_directories(libprotobuf-lite PUBLIC ${protobuf_SOURCE_DIR}/src)
if(protobuf_BUILD_SHARED_LIBS) if(protobuf_BUILD_SHARED_LIBS)

2
cmake/libprotobuf.cmake
Unescape View File

@ -124,7 +124,7 @@ if(protobuf_LINK_LIBATOMIC)
target_link_libraries(libprotobuf PRIVATE atomic) target_link_libraries(libprotobuf PRIVATE atomic)
endif() endif()
if(${CMAKE_SYSTEM_NAME} STREQUAL "Android") if(${CMAKE_SYSTEM_NAME} STREQUAL "Android")
target_link_libraries(libprotobuf PRIVATE log) target_link_libraries(libprotobuf PRIVATE log)
endif() endif()
target_include_directories(libprotobuf PUBLIC ${protobuf_SOURCE_DIR}/src) target_include_directories(libprotobuf PUBLIC ${protobuf_SOURCE_DIR}/src)
if(protobuf_BUILD_SHARED_LIBS) if(protobuf_BUILD_SHARED_LIBS)

Write Preview
Loading…
Cancel
Save