fix protobuf not consistent

Author: zhanglistar

LegacyFindPackages.cmake

@@ -79,6 +79,10 @@ if (APPLE)
     set(OPENSSL_ROOT_DIR ${OPENSSL_ROOT_DIR} /usr/local/opt/openssl/ /opt/homebrew/opt/openssl)
 endif ()
 find_package(OpenSSL REQUIRED)
+# Ensure OPENSSL_LIBRARIES is a proper CMake list (ssl and crypto as separate entries)
+if (OPENSSL_SSL_LIBRARY AND OPENSSL_CRYPTO_LIBRARY)
+    set(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
+endif ()
 message("OPENSSL_INCLUDE_DIR: " ${OPENSSL_INCLUDE_DIR})
 message("OPENSSL_LIBRARIES: " ${OPENSSL_LIBRARIES})
 
@@ -89,6 +93,17 @@ if (LATEST_PROTOBUF)
     find_package(Protobuf REQUIRED CONFIG)
 else ()
     find_package(Protobuf REQUIRED)
+    # When lib is from thirdparty, use the same prefix for includes (avoid mixing with /usr/include)
+    list(GET Protobuf_LIBRARIES 0 Protobuf_FIRST_LIB)
+    if (Protobuf_FIRST_LIB AND EXISTS "${Protobuf_FIRST_LIB}")
+        get_filename_component(Protobuf_LIB_DIR "${Protobuf_FIRST_LIB}" DIRECTORY)
+        get_filename_component(Protobuf_PREFIX "${Protobuf_LIB_DIR}" DIRECTORY)
+        set(Protobuf_THIRDPARTY_INCLUDE "${Protobuf_PREFIX}/include")
+        if (EXISTS "${Protobuf_THIRDPARTY_INCLUDE}/google/protobuf/message.h")
+            set(Protobuf_INCLUDE_DIRS ${Protobuf_THIRDPARTY_INCLUDE})
+            message(STATUS "Using Protobuf includes from thirdparty: ${Protobuf_INCLUDE_DIRS}")
+        endif ()
+    endif ()
 endif ()
 message("Protobuf_INCLUDE_DIRS: " ${Protobuf_INCLUDE_DIRS})
 message("Protobuf_LIBRARIES: " ${Protobuf_LIBRARIES})
@@ -215,14 +230,35 @@ MESSAGE(STATUS "HAS_ZSTD: ${HAS_ZSTD}")
 
 if (LIB_SNAPPY)
     set(HAS_SNAPPY 1)
+    find_path(SNAPPY_INCLUDE_DIR snappy.h)
+    if (NOT SNAPPY_INCLUDE_DIR)
+        message(WARNING "Snappy library found but snappy.h not found; Snappy includes may be missing")
+    endif ()
 else ()
     set(HAS_SNAPPY 0)
+    set(SNAPPY_INCLUDE_DIR "")
 endif ()
 MESSAGE(STATUS "HAS_SNAPPY: ${HAS_SNAPPY}")
+MESSAGE(STATUS "SNAPPY_INCLUDE_DIR: ${SNAPPY_INCLUDE_DIR}")
 
 set(ADDITIONAL_LIBRARIES $ENV{PULSAR_ADDITIONAL_LIBRARIES})
 link_directories( $ENV{PULSAR_ADDITIONAL_LIBRARY_PATH} )
 
+set(TEST_INCLUDE_DIRS "")
+if (BUILD_TESTS)
+    if (GTEST_INCLUDE_PATH)
+        list(APPEND TEST_INCLUDE_DIRS ${GTEST_INCLUDE_PATH})
+    endif ()
+    if (GMOCK_INCLUDE_PATH)
+        list(APPEND TEST_INCLUDE_DIRS ${GMOCK_INCLUDE_PATH})
+    endif ()
+endif ()
+
+set(SNAPPY_INCLUDE_DIRS "")
+if (HAS_SNAPPY AND SNAPPY_INCLUDE_DIR)
+    list(APPEND SNAPPY_INCLUDE_DIRS ${SNAPPY_INCLUDE_DIR})
+endif ()
+
 include_directories(
   ${PROJECT_SOURCE_DIR}
   ${PROJECT_SOURCE_DIR}/include
@@ -233,8 +269,8 @@ include_directories(
   ${ZLIB_INCLUDE_DIRS}
   ${CURL_INCLUDE_DIRS}
   ${Protobuf_INCLUDE_DIRS}
-  ${GTEST_INCLUDE_PATH}
-  ${GMOCK_INCLUDE_PATH}
+  ${SNAPPY_INCLUDE_DIRS}
+  ${TEST_INCLUDE_DIRS}
 )
 
 set(COMMON_LIBS