Skip to content

Commit

Permalink
Merge remote-tracking branch 'kampbell@github/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
zosrothko committed Dec 8, 2015
2 parents 212d724 + bfc4beb commit 47543ee
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions cmake/FindMySQL.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ find_path(MYSQL_INCLUDE_DIR mysql.h
$ENV{MYSQL_DIR}/include
$ENV{ProgramFiles}/MySQL/*/include
${BINDIR32}/MySQL/include
${BINDIR32}/MySQL/*/include
$ENV{SystemDrive}/MySQL/*/include)
${BINDIR32}/MySQL/*/include
$ENV{SystemDrive}/MySQL/*/include)

if (WIN32)
if (CMAKE_BUILD_TYPE STREQUAL Debug)
Expand Down

0 comments on commit 47543ee

Please sign in to comment.