detect MySQL version from its CMake module

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 614b0ce..46d7e45 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,8 +55,7 @@ include(CPack)
 
 # 9 minutes timeout for the tests, Travis timeouts on 10min if there is no
 # output and I do not want some tests to be skipped because of one test. Like
-# the qpainter test - it does a lot of tests and can (and sometimes it does)
-# take more then 10min.
+# the qpainter test - it does a lot of tests and can take more then 10min.
 set(CTEST_TEST_TIMEOUT 540)
 
 if(NOT CMAKE_VERSION VERSION_LESS "3.3.0")

diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake
index 22e6c0e..8971921 100644 (file)
--- a/cmake/modules/FindMySQL.cmake
+++ b/cmake/modules/FindMySQL.cmake
@@ -35,10 +35,17 @@ if(MYSQL_CONFIG)
         OUTPUT_VARIABLE MYSQL_LIBRARIES
         OUTPUT_STRIP_TRAILING_WHITESPACE
     )
-    # just in case
+    execute_process(
+        COMMAND ${MYSQL_CONFIG} --version
+        RESULT_VARIABLE proceerror3
+        OUTPUT_VARIABLE MYSQL_VERSION
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    # just in case, MYSQL_VERSION is not critical
     if(NOT procerror1 STREQUAL "0" OR NOT proceerror2 STREQUAL "0")
         set(MYSQL_INCLUDES)
         set(MYSQL_LIBRARIES)
+        set(MYSQL_VERSION)
     endif()
 endif()
 
@@ -61,6 +68,9 @@ if(NOT MYSQL_INCLUDES OR NOT MYSQL_LIBRARIES)
 endif()
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(MySQL DEFAULT_MSG MYSQL_INCLUDES MYSQL_LIBRARIES)
+find_package_handle_standard_args(MySQL
+    VERSION_VAR MYSQL_VERSION
+    REQUIRED_VARS MYSQL_INCLUDES MYSQL_LIBRARIES
+)
 
 mark_as_advanced(MYSQL_INCLUDES MYSQL_LIBRARIES)

diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD
index 6f4975c..09e0be7 100644 (file)
--- a/package/archlinux/PKGBUILD
+++ b/package/archlinux/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ivailo Monev <xakepa10@gmail.com>
 
 pkgname=katie-git
-pkgver=4.9.0.4e4f988b
+pkgver=4.9.0.71ff31ce
 pkgrel=1
 pkgdesc='C++ toolkit derived from the Qt 4.8 framework'
 arch=('i686' 'x86_64')