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

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

Issue 2590803003: Revert "third_party/protobuf: Update to HEAD (83d681ee2c)" (Closed)
Patch Set: 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
OLDNEW
1 set(libprotoc_files 1 set(libprotoc_files
2 ${protobuf_source_dir}/src/google/protobuf/compiler/code_generator.cc 2 ${protobuf_source_dir}/src/google/protobuf/compiler/code_generator.cc
3 ${protobuf_source_dir}/src/google/protobuf/compiler/command_line_interface.cc 3 ${protobuf_source_dir}/src/google/protobuf/compiler/command_line_interface.cc
4 ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/cpp_enum.cc 4 ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/cpp_enum.cc
5 ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/cpp_enum_field.cc 5 ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/cpp_enum_field.cc
6 ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/cpp_extension.cc 6 ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/cpp_extension.cc
7 ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/cpp_field.cc 7 ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/cpp_field.cc
8 ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/cpp_file.cc 8 ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/cpp_file.cc
9 ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/cpp_generator.cc 9 ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/cpp_generator.cc
10 ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/cpp_helpers.cc 10 ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/cpp_helpers.cc
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 ${protobuf_source_dir}/src/google/protobuf/compiler/javanano/javanano_extensio n.cc 65 ${protobuf_source_dir}/src/google/protobuf/compiler/javanano/javanano_extensio n.cc
66 ${protobuf_source_dir}/src/google/protobuf/compiler/javanano/javanano_field.cc 66 ${protobuf_source_dir}/src/google/protobuf/compiler/javanano/javanano_field.cc
67 ${protobuf_source_dir}/src/google/protobuf/compiler/javanano/javanano_file.cc 67 ${protobuf_source_dir}/src/google/protobuf/compiler/javanano/javanano_file.cc
68 ${protobuf_source_dir}/src/google/protobuf/compiler/javanano/javanano_generato r.cc 68 ${protobuf_source_dir}/src/google/protobuf/compiler/javanano/javanano_generato r.cc
69 ${protobuf_source_dir}/src/google/protobuf/compiler/javanano/javanano_helpers. cc 69 ${protobuf_source_dir}/src/google/protobuf/compiler/javanano/javanano_helpers. cc
70 ${protobuf_source_dir}/src/google/protobuf/compiler/javanano/javanano_map_fiel d.cc 70 ${protobuf_source_dir}/src/google/protobuf/compiler/javanano/javanano_map_fiel d.cc
71 ${protobuf_source_dir}/src/google/protobuf/compiler/javanano/javanano_message. cc 71 ${protobuf_source_dir}/src/google/protobuf/compiler/javanano/javanano_message. cc
72 ${protobuf_source_dir}/src/google/protobuf/compiler/javanano/javanano_message_ field.cc 72 ${protobuf_source_dir}/src/google/protobuf/compiler/javanano/javanano_message_ field.cc
73 ${protobuf_source_dir}/src/google/protobuf/compiler/javanano/javanano_primitiv e_field.cc 73 ${protobuf_source_dir}/src/google/protobuf/compiler/javanano/javanano_primitiv e_field.cc
74 ${protobuf_source_dir}/src/google/protobuf/compiler/js/js_generator.cc 74 ${protobuf_source_dir}/src/google/protobuf/compiler/js/js_generator.cc
75 ${protobuf_source_dir}/src/google/protobuf/compiler/js/well_known_types_embed. cc
76 ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_enum .cc 75 ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_enum .cc
77 ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_enum _field.cc 76 ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_enum _field.cc
78 ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_exte nsion.cc 77 ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_exte nsion.cc
79 ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_fiel d.cc 78 ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_fiel d.cc
80 ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_file .cc 79 ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_file .cc
81 ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_gene rator.cc 80 ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_gene rator.cc
82 ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_help ers.cc 81 ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_help ers.cc
83 ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_map_ field.cc 82 ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_map_ field.cc
84 ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_mess age.cc 83 ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_mess age.cc
85 ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_mess age_field.cc 84 ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_mess age_field.cc
86 ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_oneo f.cc 85 ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_oneo f.cc
87 ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_prim itive_field.cc 86 ${protobuf_source_dir}/src/google/protobuf/compiler/objectivec/objectivec_prim itive_field.cc
88 ${protobuf_source_dir}/src/google/protobuf/compiler/php/php_generator.cc
89 ${protobuf_source_dir}/src/google/protobuf/compiler/plugin.cc 87 ${protobuf_source_dir}/src/google/protobuf/compiler/plugin.cc
90 ${protobuf_source_dir}/src/google/protobuf/compiler/plugin.pb.cc 88 ${protobuf_source_dir}/src/google/protobuf/compiler/plugin.pb.cc
91 ${protobuf_source_dir}/src/google/protobuf/compiler/python/python_generator.cc 89 ${protobuf_source_dir}/src/google/protobuf/compiler/python/python_generator.cc
92 ${protobuf_source_dir}/src/google/protobuf/compiler/ruby/ruby_generator.cc 90 ${protobuf_source_dir}/src/google/protobuf/compiler/ruby/ruby_generator.cc
93 ${protobuf_source_dir}/src/google/protobuf/compiler/subprocess.cc 91 ${protobuf_source_dir}/src/google/protobuf/compiler/subprocess.cc
94 ${protobuf_source_dir}/src/google/protobuf/compiler/zip_writer.cc 92 ${protobuf_source_dir}/src/google/protobuf/compiler/zip_writer.cc
95 ) 93 )
96 94
97 add_library(libprotoc ${protobuf_SHARED_OR_STATIC} 95 add_library(libprotoc ${protobuf_SHARED_OR_STATIC}
98 ${libprotoc_files}) 96 ${libprotoc_files})
99 target_link_libraries(libprotoc libprotobuf) 97 target_link_libraries(libprotoc libprotobuf)
100 if(MSVC AND protobuf_BUILD_SHARED_LIBS) 98 if(MSVC AND protobuf_BUILD_SHARED_LIBS)
101 target_compile_definitions(libprotoc 99 target_compile_definitions(libprotoc
102 PUBLIC PROTOBUF_USE_DLLS 100 PUBLIC PROTOBUF_USE_DLLS
103 PRIVATE LIBPROTOC_EXPORTS) 101 PRIVATE LIBPROTOC_EXPORTS)
104 endif() 102 endif()
105 set_target_properties(libprotoc PROPERTIES 103 set_target_properties(libprotoc PROPERTIES
106 COMPILE_DEFINITIONS LIBPROTOC_EXPORTS 104 COMPILE_DEFINITIONS LIBPROTOC_EXPORTS
107 OUTPUT_NAME ${LIB_PREFIX}protoc 105 OUTPUT_NAME ${LIB_PREFIX}protoc
108 DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}") 106 DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
OLDNEW
« no previous file with comments | « third_party/protobuf/cmake/libprotobuf.cmake ('k') | third_party/protobuf/cmake/protobuf-config-version.cmake.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698