diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-25 22:58:57 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-25 22:58:57 +0300 |
| commit | accce6be6eba077aaa538c8b0f4d1a839d08abe6 (patch) | |
| tree | 4b3b3b110f6d30f408577b12710f0925376eb883 /mysys | |
| parent | a98481354e99f4bd27ca91e74518999eb5dee359 (diff) | |
| parent | 49e7114fdb3520462a40f22d17f267686a5f1f3f (diff) | |
| download | mariadb-git-accce6be6eba077aaa538c8b0f4d1a839d08abe6.tar.gz | |
Auto-merge from mysql-next-mr.
Diffstat (limited to 'mysys')
| -rwxr-xr-x | mysys/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt index c035a2f0b49..2fbaac7fe72 100755 --- a/mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt @@ -42,7 +42,7 @@ IF (WIN32) SET (MYSYS_SOURCES ${MYSYS_SOURCES} my_winthread.c my_wincond.c my_winerr.c my_winfile.c my_windac.c my_conio.c) ENDIF() -IF(CMAKE_COMPILER_IS_GNUCC AND NOT HAVE_CXX_NEW) +IF(NOT HAVE_CXX_NEW) # gcc as C++ compiler does not have new/delete SET(MYSYS_SOURCES ${MYSYS_SOURCES} my_new.cc) ADD_DEFINITIONS( -DUSE_MYSYS_NEW) |