Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
P
protobuf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
protobuf
Commits
6ab3196d
Unverified
Commit
6ab3196d
authored
May 15, 2018
by
Feng Xiao
Committed by
GitHub
May 15, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4632 from chronoxor/master
Fix issue with version.rc
parents
5932547a
291d9a0a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
0 deletions
+8
-0
libprotobuf-lite.cmake
cmake/libprotobuf-lite.cmake
+2
-0
libprotobuf.cmake
cmake/libprotobuf.cmake
+2
-0
libprotoc.cmake
cmake/libprotoc.cmake
+2
-0
protoc.cmake
cmake/protoc.cmake
+2
-0
No files found.
cmake/libprotobuf-lite.cmake
View file @
6ab3196d
...
...
@@ -48,9 +48,11 @@ set(libprotobuf_lite_includes
${
protobuf_source_dir
}
/src/google/protobuf/wire_format_lite.h
)
if
(
MSVC
)
set
(
libprotobuf_lite_rc_files
${
CMAKE_CURRENT_BINARY_DIR
}
/version.rc
)
endif
()
add_library
(
libprotobuf-lite
${
protobuf_SHARED_OR_STATIC
}
${
libprotobuf_lite_files
}
${
libprotobuf_lite_includes
}
${
libprotobuf_lite_rc_files
}
)
...
...
cmake/libprotobuf.cmake
View file @
6ab3196d
...
...
@@ -112,9 +112,11 @@ set(libprotobuf_includes
${
protobuf_source_dir
}
/src/google/protobuf/wrappers.pb.h
)
if
(
MSVC
)
set
(
libprotobuf_rc_files
${
CMAKE_CURRENT_BINARY_DIR
}
/version.rc
)
endif
()
add_library
(
libprotobuf
${
protobuf_SHARED_OR_STATIC
}
${
libprotobuf_lite_files
}
${
libprotobuf_files
}
${
libprotobuf_includes
}
${
libprotobuf_rc_files
}
)
...
...
cmake/libprotoc.cmake
View file @
6ab3196d
...
...
@@ -161,9 +161,11 @@ set(libprotoc_headers
${
protobuf_source_dir
}
/src/google/protobuf/compiler/zip_writer.h
)
if
(
MSVC
)
set
(
libprotoc_rc_files
${
CMAKE_CURRENT_BINARY_DIR
}
/version.rc
)
endif
()
set
(
js_well_known_types_sources
${
protobuf_source_dir
}
/src/google/protobuf/compiler/js/well_known_types/any.js
...
...
cmake/protoc.cmake
View file @
6ab3196d
...
...
@@ -2,9 +2,11 @@ set(protoc_files
${
protobuf_source_dir
}
/src/google/protobuf/compiler/main.cc
)
if
(
MSVC
)
set
(
protoc_rc_files
${
CMAKE_CURRENT_BINARY_DIR
}
/version.rc
)
endif
()
add_executable
(
protoc
${
protoc_files
}
${
protoc_rc_files
}
)
target_link_libraries
(
protoc libprotobuf libprotoc
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment