diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-12-14 19:20:17 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-12-14 19:20:17 +0000 |
| commit | c13b5011629b5ff7b969d648265002e4d1ba94c2 (patch) | |
| tree | 2d357b1affd6314399747cecd411180bd3d0525a | |
| parent | d93bbcad369c723c4ddf81a528576c9872d26d44 (diff) | |
| download | mariadb-git-c13b5011629b5ff7b969d648265002e4d1ba94c2.tar.gz | |
Fix broken cmake -DBUILD_CONFIG=mysql_release on Windows.mariadb-10.1.20
mysql_release.cmake set WITH_JEMALLOC=static, which makes windows
builds fail since there is no jemalloc either static or shared there
| -rw-r--r-- | cmake/build_configurations/mysql_release.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake index ef9713e0556..363cbac584d 100644 --- a/cmake/build_configurations/mysql_release.cmake +++ b/cmake/build_configurations/mysql_release.cmake @@ -83,7 +83,8 @@ IF(FEATURE_SET) ENDIF() OPTION(ENABLED_LOCAL_INFILE "" ON) -IF(RPM) +IF(WIN32) +ELSEIF(RPM) SET(WITH_SSL system CACHE STRING "") SET(WITH_ZLIB system CACHE STRING "") ELSEIF(DEB) |