diff options
| author | Brad King <brad.king@kitware.com> | 2023-06-20 17:08:29 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-06-20 17:08:47 (GMT) |
| commit | 023da1a71860487d5ef8421a4e7e1bdbcc77a20c (patch) | |
| tree | 2e99832a36cc1849060e56482f303bd57cd7c236 | |
| parent | 9eccac530c28df41be893d6cfcab2a88762c034b (diff) | |
| parent | fc7dcc6a24ffd33b780104ebd9dbb115d306827e (diff) | |
| download | CMake-023da1a71860487d5ef8421a4e7e1bdbcc77a20c.zip CMake-023da1a71860487d5ef8421a4e7e1bdbcc77a20c.tar.gz CMake-023da1a71860487d5ef8421a4e7e1bdbcc77a20c.tar.bz2 | |
Merge topic 'FindProtobuf-version-schemes'
fc7dcc6a24 FindProtobuf: Support new version number scheme
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !8574
| -rw-r--r-- | Modules/FindProtobuf.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Modules/FindProtobuf.cmake b/Modules/FindProtobuf.cmake index c73a2d8..b046fcc 100644 --- a/Modules/FindProtobuf.cmake +++ b/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} ] " |