Explorar o código

Merge topic 'FindProtobuf-version-schemes' into release-3.27

fc7dcc6a24 FindProtobuf: Support new version number scheme

Acked-by: Kitware Robot <[email protected]>
Reviewed-by: Ben Boeckel <[email protected]>
Merge-request: !8574
Brad King %!s(int64=2) %!d(string=hai) anos
pai
achega
f342a655e4
Modificáronse 1 ficheiros con 5 adicións e 1 borrados
  1. 5 1
      Modules/FindProtobuf.cmake

+ 5 - 1
Modules/FindProtobuf.cmake

@@ -499,7 +499,11 @@ if(Protobuf_INCLUDE_DIR)
   math(EXPR _PROTOBUF_MAJOR_VERSION "${Protobuf_LIB_VERSION} / 1000000")
   math(EXPR _PROTOBUF_MINOR_VERSION "${Protobuf_LIB_VERSION} / 1000 % 1000")
   math(EXPR _PROTOBUF_SUBMINOR_VERSION "${Protobuf_LIB_VERSION} % 1000")
-  set(Protobuf_VERSION "${_PROTOBUF_MAJOR_VERSION}.${_PROTOBUF_MINOR_VERSION}.${_PROTOBUF_SUBMINOR_VERSION}")
+  if (_PROTOBUF_MINOR_VERSION GREATER_EQUAL "21")
+    set(Protobuf_VERSION "${_PROTOBUF_MINOR_VERSION}.${_PROTOBUF_SUBMINOR_VERSION}")
+  else()
+    set(Protobuf_VERSION "${_PROTOBUF_MAJOR_VERSION}.${_PROTOBUF_MINOR_VERSION}.${_PROTOBUF_SUBMINOR_VERSION}")
+  endif()
 
   if(Protobuf_DEBUG)
     message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "