Skip to content

Commit

Permalink
fix server version detection
Browse files Browse the repository at this point in the history
  • Loading branch information
vuvova committed Jun 24, 2017
1 parent 1c8ccfe commit 1ffe387
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -159,14 +159,14 @@ ENDIF()
SET(PROTOCOL_VERSION 10) # we adapted new password option from PHP's mysqlnd !
# if C/C is build as subproject inside MariaDB server tree we will
# use the version defined by server
IF(MYSQL_VERSION_MAJOR)
SET(MARIADB_CLIENT_VERSION_MAJOR ${MYSQL_VERSION_MAJOR})
SET(MARIADB_CLIENT_VERSION_MINOR ${MYSQL_VERSION_MINOR})
SET(MARIADB_CLIENT_VERSION_PATCH ${MYSQL_VERSION_PATCH})
IF(MAJOR_VERSION)
SET(MARIADB_CLIENT_VERSION_MAJOR ${MAJOR_VERSION})
SET(MARIADB_CLIENT_VERSION_MINOR ${MINOR_VERSION})
SET(MARIADB_CLIENT_VERSION_PATCH ${PATCH_VERSION})
ELSE()
SET(MARIADB_CLIENT_VERSION_MAJOR "10")
SET(MARIADB_CLIENT_VERSION_MINOR "2")
SET(MARIADB_CLIENT_VERSION_PATCH "5")
SET(MARIADB_CLIENT_VERSION_PATCH "6")
ENDIF()
SET(MARIADB_CLIENT_VERSION "${MARIADB_CLIENT_VERSION_MAJOR}.${MARIADB_CLIENT_VERSION_MINOR}.${MARIADB_CLIENT_VERSION_PATCH}")
MATH(EXPR MARIADB_VERSION_ID "${MARIADB_CLIENT_VERSION_MAJOR} * 10000 +
Expand Down

0 comments on commit 1ffe387

Please sign in to comment.