Skip to content

Commit

Permalink
Bug#30141272 VERSION CHECK FOR PROTOBUF IS WRONG
Browse files Browse the repository at this point in the history
We have source code which uses <google/protobuf/util/json_util.h>
This was introduced in 3.0 so update cmake version check accordingly.

Change-Id: Ia7e94b88bd836119df033406534566073997145e
  • Loading branch information
Tor Didriksen committed Aug 6, 2019
1 parent 9dca539 commit e27b55e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions cmake/protobuf.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ ENDMACRO()
MACRO(COULD_NOT_FIND_PROTOBUF)
ECHO_PROTOBUF_VARIABLES()
MESSAGE(STATUS "Could not find (the correct version of) protobuf.")
MESSAGE(STATUS "MySQL currently requires at least protobuf version 2.5")
MESSAGE(STATUS "MySQL currently requires at least protobuf version 3.0")
MESSAGE(FATAL_ERROR
"You can build with the bundled sources"
)
Expand Down Expand Up @@ -129,7 +129,7 @@ MACRO(MYSQL_CHECK_PROTOBUF)
MESSAGE(STATUS
"PROTOBUF_VERSION_NUMBER is ${PROTOBUF_VERSION_NUMBER}")

IF("${PROTOBUF_MAJOR_VERSION}.${PROTOBUF_MINOR_VERSION}" VERSION_LESS "2.5")
IF("${PROTOBUF_MAJOR_VERSION}.${PROTOBUF_MINOR_VERSION}" VERSION_LESS "3.0")
COULD_NOT_FIND_PROTOBUF()
ENDIF()
ECHO_PROTOBUF_VARIABLES()
Expand Down

0 comments on commit e27b55e

Please sign in to comment.