diff options
| author |  Gil <mcg@google.com> | 2018-06-12 10:55:48 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-06-12 10:55:48 -0700 |
| commit | 0db8ef7dbe6c8c191252d33090dbb88b98735148 (patch) | |
| tree | 35ada9d92eddbe4b43e8850eb52f5855755f8895 /cmake/FindProtobuf.cmake | |
| parent | 9e14b80e0716c2be71c6100cad7aa7c61ac46c6e (diff) | |
Fix protobuf/nanopb builds on Windows (#1392)
* Build protobuf with CMake for compatibility with Windows.
Fixes b/74067357
* Update to nanopb 0.3.9.1
This release includes functional CMake support for building the protoc
plugin.
* Fix license
* Build nanopb out-of-source
This is possible now that the build is CMake-based.
* Find protoc on windows
* Define CMAKE_ARGS in a more straightforward way
* Adjust libprotobuf locations to account for CMake build
Diffstat (limited to 'cmake/FindProtobuf.cmake')
| -rw-r--r-- | cmake/FindProtobuf.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmake/FindProtobuf.cmake b/cmake/FindProtobuf.cmake index e9a1a81..60a2e34 100644 --- a/cmake/FindProtobuf.cmake +++ b/cmake/FindProtobuf.cmake @@ -23,14 +23,14 @@ find_path( find_library( PROTOBUF_LIBRARY - NAMES libprotobuf.a - HINTS ${BINARY_DIR}/src/protobuf-build/src/.libs/ + NAMES protobuf protobufd + HINTS ${BINARY_DIR}/src/protobuf-build ) find_library( PROTOBUFLITE_LIBRARY - NAMES libprotobuf-lite.a - HINTS ${BINARY_DIR}/src/protobuf-build/src/.libs/ + NAMES protobuf-lite protobuf-lited + HINTS ${BINARY_DIR}/src/protobuf-build ) find_package_handle_standard_args( |