Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(666)

Side by Side Diff: third_party/protobuf/cmake/libprotobuf.cmake

Issue 2599263002: third_party/protobuf: Update to HEAD (f52e188fe4) (Closed)
Patch Set: Address comments Created 3 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « third_party/protobuf/cmake/install.cmake ('k') | third_party/protobuf/cmake/libprotoc.cmake » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 set(libprotobuf_files 1 set(libprotobuf_files
2 ${protobuf_source_dir}/src/google/protobuf/any.cc 2 ${protobuf_source_dir}/src/google/protobuf/any.cc
3 ${protobuf_source_dir}/src/google/protobuf/any.pb.cc 3 ${protobuf_source_dir}/src/google/protobuf/any.pb.cc
4 ${protobuf_source_dir}/src/google/protobuf/api.pb.cc 4 ${protobuf_source_dir}/src/google/protobuf/api.pb.cc
5 ${protobuf_source_dir}/src/google/protobuf/compiler/importer.cc 5 ${protobuf_source_dir}/src/google/protobuf/compiler/importer.cc
6 ${protobuf_source_dir}/src/google/protobuf/compiler/parser.cc 6 ${protobuf_source_dir}/src/google/protobuf/compiler/parser.cc
7 ${protobuf_source_dir}/src/google/protobuf/descriptor.cc 7 ${protobuf_source_dir}/src/google/protobuf/descriptor.cc
8 ${protobuf_source_dir}/src/google/protobuf/descriptor.pb.cc 8 ${protobuf_source_dir}/src/google/protobuf/descriptor.pb.cc
9 ${protobuf_source_dir}/src/google/protobuf/descriptor_database.cc 9 ${protobuf_source_dir}/src/google/protobuf/descriptor_database.cc
10 ${protobuf_source_dir}/src/google/protobuf/duration.pb.cc 10 ${protobuf_source_dir}/src/google/protobuf/duration.pb.cc
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 ${protobuf_source_dir}/src/google/protobuf/util/json_util.cc 49 ${protobuf_source_dir}/src/google/protobuf/util/json_util.cc
50 ${protobuf_source_dir}/src/google/protobuf/util/message_differencer.cc 50 ${protobuf_source_dir}/src/google/protobuf/util/message_differencer.cc
51 ${protobuf_source_dir}/src/google/protobuf/util/time_util.cc 51 ${protobuf_source_dir}/src/google/protobuf/util/time_util.cc
52 ${protobuf_source_dir}/src/google/protobuf/util/type_resolver_util.cc 52 ${protobuf_source_dir}/src/google/protobuf/util/type_resolver_util.cc
53 ${protobuf_source_dir}/src/google/protobuf/wire_format.cc 53 ${protobuf_source_dir}/src/google/protobuf/wire_format.cc
54 ${protobuf_source_dir}/src/google/protobuf/wrappers.pb.cc 54 ${protobuf_source_dir}/src/google/protobuf/wrappers.pb.cc
55 ) 55 )
56 56
57 add_library(libprotobuf ${protobuf_SHARED_OR_STATIC} 57 add_library(libprotobuf ${protobuf_SHARED_OR_STATIC}
58 ${libprotobuf_lite_files} ${libprotobuf_files}) 58 ${libprotobuf_lite_files} ${libprotobuf_files})
59 target_link_libraries(libprotobuf ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES}) 59 target_link_libraries(libprotobuf ${CMAKE_THREAD_LIBS_INIT})
60 if(protobuf_WITH_ZLIB)
61 target_link_libraries(libprotobuf ${ZLIB_LIBRARIES})
62 endif()
60 target_include_directories(libprotobuf PUBLIC ${protobuf_source_dir}/src) 63 target_include_directories(libprotobuf PUBLIC ${protobuf_source_dir}/src)
61 if(MSVC AND protobuf_BUILD_SHARED_LIBS) 64 if(MSVC AND protobuf_BUILD_SHARED_LIBS)
62 target_compile_definitions(libprotobuf 65 target_compile_definitions(libprotobuf
63 PUBLIC PROTOBUF_USE_DLLS 66 PUBLIC PROTOBUF_USE_DLLS
64 PRIVATE LIBPROTOBUF_EXPORTS) 67 PRIVATE LIBPROTOBUF_EXPORTS)
65 endif() 68 endif()
66 set_target_properties(libprotobuf PROPERTIES 69 set_target_properties(libprotobuf PROPERTIES
67 OUTPUT_NAME ${LIB_PREFIX}protobuf 70 OUTPUT_NAME ${LIB_PREFIX}protobuf
68 DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}") 71 DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
OLDNEW
« no previous file with comments | « third_party/protobuf/cmake/install.cmake ('k') | third_party/protobuf/cmake/libprotoc.cmake » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698