Merge with develop
This commit is contained in:
commit
53a5f1275f
1 changed files with 6 additions and 0 deletions
|
@ -20,6 +20,8 @@ ELSE()
|
||||||
/usr/include/mysql
|
/usr/include/mysql
|
||||||
/usr/local/include/mysql
|
/usr/local/include/mysql
|
||||||
/opt/local/include/mysql5/mysql
|
/opt/local/include/mysql5/mysql
|
||||||
|
/opt/local/include/mysql55/mysql
|
||||||
|
/opt/local/include/mysql51/mysql
|
||||||
$ENV{ProgramFiles}/MySQL/*/include
|
$ENV{ProgramFiles}/MySQL/*/include
|
||||||
$ENV{SystemDrive}/MySQL/*/include)
|
$ENV{SystemDrive}/MySQL/*/include)
|
||||||
|
|
||||||
|
@ -41,6 +43,8 @@ ELSE()
|
||||||
/usr/lib/mysql
|
/usr/lib/mysql
|
||||||
/usr/local/lib/mysql
|
/usr/local/lib/mysql
|
||||||
/opt/local/lib/mysql5/mysql
|
/opt/local/lib/mysql5/mysql
|
||||||
|
/opt/local/lib/mysql55/mysql
|
||||||
|
/opt/local/lib/mysql51/mysql
|
||||||
)
|
)
|
||||||
|
|
||||||
FIND_LIBRARY(MYSQL_LIBRARY_DEBUG NAMES mysqlclientd
|
FIND_LIBRARY(MYSQL_LIBRARY_DEBUG NAMES mysqlclientd
|
||||||
|
@ -50,6 +54,8 @@ ELSE()
|
||||||
/usr/lib/mysql
|
/usr/lib/mysql
|
||||||
/usr/local/lib/mysql
|
/usr/local/lib/mysql
|
||||||
/opt/local/lib/mysql5/mysql
|
/opt/local/lib/mysql5/mysql
|
||||||
|
/opt/local/lib/mysql55/mysql
|
||||||
|
/opt/local/lib/mysql51/mysql
|
||||||
)
|
)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue