diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2017-03-11 20:12:15 +0000 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2017-03-11 20:12:15 +0000 |
| commit | 5b30c7896e8514b29dba0909272cda49910243ae (patch) | |
| tree | 9f4213363cb529795ae15fdb00b3e4f6ecd72ed5 /CMakeLists.txt | |
| parent | 5c1c2f67ec9373f55f9b69bdaf4adad416e4788b (diff) | |
| parent | eded6243bc4796ab44e70403edd059d32225f589 (diff) | |
| download | mariadb-git-5b30c7896e8514b29dba0909272cda49910243ae.tar.gz | |
Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocks
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a9d6079c7f..3685ed42381 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -183,18 +183,18 @@ INCLUDE(check_compiler_flag) OPTION(WITH_ASAN "Enable address sanitizer" OFF) IF (WITH_ASAN) # gcc 4.8.1 and new versions of clang - MY_CHECK_AND_SET_COMPILER_FLAG("-fsanitize=address -O1 -Wno-error -fPIC" + MY_CHECK_AND_SET_COMPILER_FLAG("-fsanitize=address -fPIC" DEBUG RELWITHDEBINFO) - SET(HAVE_C_FSANITIZE ${HAVE_C__fsanitize_address__O1__Wno_error__fPIC}) - SET(HAVE_CXX_FSANITIZE ${HAVE_CXX__fsanitize_address__O1__Wno_error__fPIC}) + SET(HAVE_C_FSANITIZE ${have_C__fsanitize_address__fPIC}) + SET(HAVE_CXX_FSANITIZE ${have_CXX__fsanitize_address__fPIC}) IF(HAVE_C_FSANITIZE AND HAVE_CXX_FSANITIZE) SET(WITH_ASAN_OK 1) ELSE() # older versions of clang - MY_CHECK_AND_SET_COMPILER_FLAG("-faddress-sanitizer -O1 -fPIC" + MY_CHECK_AND_SET_COMPILER_FLAG("-faddress-sanitizer -fPIC" DEBUG RELWITHDEBINFO) - SET(HAVE_C_FADDRESS ${HAVE_C__faddress_sanitizer__O1__fPIC}) - SET(HAVE_CXX_FADDRESS ${HAVE_CXX__faddress_sanitizer__O1__fPIC}) + SET(HAVE_C_FADDRESS ${have_C__faddress_sanitizer__fPIC}) + SET(HAVE_CXX_FADDRESS ${have_CXX__faddress_sanitizer__fPIC}) IF(HAVE_C_FADDRESS AND HAVE_CXX_FADDRESS) SET(WITH_ASAN_OK 1) ENDIF() @@ -274,7 +274,7 @@ ENDIF() # Set commonly used variables IF(WIN32) - SET(DEFAULT_MYSQL_HOME "C:/MariaDB${MYSQL_BASE_VERSION}") + SET(DEFAULT_MYSQL_HOME "C:/Program Files/MariaDB ${MYSQL_BASE_VERSION}") SET(SHAREDIR share) ELSE() SET(DEFAULT_MYSQL_HOME ${CMAKE_INSTALL_PREFIX}) |