From 26917aa90482d3854b2c3b4504eb321b4b6a77f5 Mon Sep 17 00:00:00 2001 From: Ay'yaruq Dotharl Date: Sat, 18 Nov 2017 14:43:17 +1100 Subject: [PATCH] Fix CMake MySQL module to be more nix-friendly --- cmake/mysql.cmake | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/cmake/mysql.cmake b/cmake/mysql.cmake index 50d6edff..7e3ceccf 100644 --- a/cmake/mysql.cmake +++ b/cmake/mysql.cmake @@ -1,6 +1,29 @@ if(UNIX) - include_directories("/usr/include/mysql/") + find_path(MYSQL_INCLUDE_DIR mysql.h + /usr/include/mysql + /usr/local/include/mysql + /opt/mysql/mysql/include + /opt/mysql/mysql/include/mysql + /opt/mysql/include + /opt/local/include/mysql5 + /usr/local/mysql/include + /usr/local/mysql/include/mysql + $ENV{ProgramFiles}/MySQL/*/include + $ENV{SystemDrive}/MySQL/*/include + ) + + if(MYSQL_INCLUDE_DIR) + set(MYSQL_FOUND TRUE) + + include_directories(${MYSQL_INCLUDE_DIR}) + endif(MYSQL_INCLUDE_DIR) + + if(MYSQL_FOUND) + message(STATUS "MySQL include dir: ${MYSQL_INCLUDE_DIR}") + else(MYSQL_FOUND) + message(FATAL_ERROR "Could not find MySQL headers.") + endif(MYSQL_FOUND) else() include_directories("${LIBRARY_DIR}/external/MySQL/") if(CMAKE_SIZEOF_VOID_P EQUAL 4) @@ -13,5 +36,3 @@ else() link_directories(${LIBRARY_DIR}/external/zlib/x64) endif() endif() - -