|
 |
20b247 |
--- orc-rel-release-1.6.6/cmake_modules/FindProtobuf.cmake.orig 2021-09-15 14:15:19.726344469 -0400
|
|
|
20b247 |
+++ orc-rel-release-1.6.6/cmake_modules/FindProtobuf.cmake 2021-09-15 14:16:22.330307272 -0400
|
|
|
20b247 |
@@ -15,8 +15,8 @@
|
|
|
20b247 |
# PROTOBUF_FOUND is set if Protobuf is found
|
|
|
20b247 |
# PROTOBUF_INCLUDE_DIR: directory containing headers
|
|
|
20b247 |
# PROTOBUF_LIBS: directory containing Protobuf libraries
|
|
|
20b247 |
-# PROTOBUF_STATIC_LIB: location of protobuf.a
|
|
|
20b247 |
-# PROTOC_STATIC_LIB: location of protoc.a
|
|
|
20b247 |
+# PROTOBUF_SHARED_LIB: location of protobuf.a
|
|
|
20b247 |
+# PROTOC_SHARED_LIB: location of protoc.a
|
|
|
20b247 |
# PROTOBUF_EXECUTABLE: location of protoc
|
|
|
20b247 |
|
|
|
20b247 |
|
|
|
20b247 |
@@ -54,16 +54,16 @@
|
|
|
20b247 |
get_filename_component (PROTOBUF_LIBS ${PROTOBUF_LIBRARY} PATH)
|
|
|
20b247 |
set (PROTOBUF_LIB_NAME protobuf)
|
|
|
20b247 |
set (PROTOC_LIB_NAME protoc)
|
|
|
20b247 |
- set (PROTOBUF_STATIC_LIB ${PROTOBUF_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${PROTOBUF_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX})
|
|
|
20b247 |
- set (PROTOC_STATIC_LIB ${PROTOBUF_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${PROTOC_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX})
|
|
|
20b247 |
+ set (PROTOBUF_SHARED_LIB ${PROTOBUF_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${PROTOBUF_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
|
|
|
20b247 |
+ set (PROTOC_SHARED_LIB ${PROTOBUF_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${PROTOC_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
|
|
|
20b247 |
else ()
|
|
|
20b247 |
set (PROTOBUF_FOUND FALSE)
|
|
|
20b247 |
endif ()
|
|
|
20b247 |
|
|
|
20b247 |
if (PROTOBUF_FOUND)
|
|
|
20b247 |
message (STATUS "Found the Protobuf headers: ${PROTOBUF_INCLUDE_DIR}")
|
|
|
20b247 |
- message (STATUS "Found the Protobuf library: ${PROTOBUF_STATIC_LIB}")
|
|
|
20b247 |
- message (STATUS "Found the Protoc library: ${PROTOC_STATIC_LIB}")
|
|
|
20b247 |
+ message (STATUS "Found the Protobuf library: ${PROTOBUF_SHARED_LIB}")
|
|
|
20b247 |
+ message (STATUS "Found the Protoc library: ${PROTOC_SHARED_LIB}")
|
|
|
20b247 |
message (STATUS "Found the Protoc executable: ${PROTOBUF_EXECUTABLE}")
|
|
|
20b247 |
else()
|
|
|
20b247 |
if (_protobuf_path)
|
|
|
20b247 |
@@ -82,6 +82,6 @@
|
|
|
20b247 |
mark_as_advanced (
|
|
|
20b247 |
PROTOBUF_INCLUDE_DIR
|
|
|
20b247 |
PROTOBUF_LIBS
|
|
|
20b247 |
- PROTOBUF_STATIC_LIB
|
|
|
20b247 |
- PROTOC_STATIC_LIB
|
|
|
20b247 |
+ PROTOBUF_SHARED_LIB
|
|
|
20b247 |
+ PROTOC_SHARED_LIB
|
|
|
20b247 |
)
|