From 0db8ef7dbe6c8c191252d33090dbb88b98735148 Mon Sep 17 00:00:00 2001 From: Gil Date: Tue, 12 Jun 2018 10:55:48 -0700 Subject: 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 --- cmake/FindProtobuf.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cmake/FindProtobuf.cmake') 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( -- cgit v1.2.3