diff options
Diffstat (limited to 'src/cmake/macros')
| -rw-r--r-- | src/cmake/macros/FindMySQL.cmake | 2 | ||||
| -rw-r--r-- | src/cmake/macros/FindOpenSSL.cmake | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/cmake/macros/FindMySQL.cmake b/src/cmake/macros/FindMySQL.cmake index 88b49578fc..e72fcb08b4 100644 --- a/src/cmake/macros/FindMySQL.cmake +++ b/src/cmake/macros/FindMySQL.cmake @@ -154,6 +154,7 @@ find_path(MYSQL_INCLUDE_DIR "$ENV{ProgramFiles}/MySQL/*/include" "$ENV{SystemDrive}/MySQL/*/include" "c:/msys/local/include" + "$ENV{MYSQL_INCLUDE_DIR}" DOC "Specify the directory containing mysql.h." ) @@ -197,6 +198,7 @@ if( WIN32 ) "$ENV{ProgramFiles}/MySQL/*/lib/opt" "$ENV{SystemDrive}/MySQL/*/lib/opt" "c:/msys/local/include" + "$ENV{MYSQL_LIBRARY}" DOC "Specify the location of the mysql library here." ) endif( WIN32 ) diff --git a/src/cmake/macros/FindOpenSSL.cmake b/src/cmake/macros/FindOpenSSL.cmake index 2e22bea4bc..877e96d1f9 100644 --- a/src/cmake/macros/FindOpenSSL.cmake +++ b/src/cmake/macros/FindOpenSSL.cmake @@ -28,6 +28,7 @@ SET(_OPENSSL_ROOT_HINTS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;Inno Setup: App Path]" + "$ENV{OPENSSL_ROOT_DIR}" ) IF(PLATFORM EQUAL 64) |