Ticket #49296: patch-cmake-modules-FindMySQL.cmake.diff

File patch-cmake-modules-FindMySQL.cmake.diff, 1.0 KB (added by RJVB (René Bertin), 10 years ago)

  • cmake/modules/FindMySQL.cmake 

    diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake
index 3912866..8f44739 100644
    a b else(WIN32) 
    3030      PATHS
    3131      $ENV{MYSQL_INCLUDE_DIR}
    3232      $ENV{MYSQL_DIR}/include
    33       /usr/local/mysql/include
     33      %PREFIX%/include/mariadb/mysql
     34      %PREFIX%/include/mysql5/mysql
    3435      /opt/mysql/mysql/include
    3536      PATH_SUFFIXES
    3637      mysql
    … … else(WIN32) 
    6869      $ENV{MYSQL_DIR}/libmysql_r/.libs
    6970      $ENV{MYSQL_DIR}/lib
    7071      $ENV{MYSQL_DIR}/lib/mysql
    71       /usr/local/mysql/lib
    7272      /opt/mysql/mysql/lib
     73         %PREFIX%/lib/mariadb/mysql
     74         %PREFIX%/lib/mysql5/mysql
    7375      PATH_SUFFIXES
    7476      mysql
    7577   )
    … … else(WIN32) 
    9193      $ENV{MYSQL_DIR}/libmysql_r/.libs
    9294      $ENV{MYSQL_DIR}/lib
    9395      $ENV{MYSQL_DIR}/lib/mysql
    94       /usr/local/mysql/lib
    9596      /opt/mysql/mysql/lib
     97         %PREFIX%/lib/mariadb/mysql
     98         %PREFIX%/lib/mysql5/mysql
    9699      PATH_SUFFIXES
    97100      mysql
    98101   )