diff options
| author | Alexander Nozdrin <alik@ibmvm> | 2010-07-19 18:00:29 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@ibmvm> | 2010-07-19 18:00:29 +0400 |
| commit | b5eac2b2cec6919a57adc5dbf6dae39ce5525eff (patch) | |
| tree | 6ba958e0b0ab253cbf6193e11f5e36bcbc694622 /cmake/os | |
| parent | 917c33cfbf7feade67ae4d4d884870e8f96f822e (diff) | |
| parent | e875a1d66b83b758c34d2190ffd180bd626327ea (diff) | |
| download | mariadb-git-b5eac2b2cec6919a57adc5dbf6dae39ce5525eff.tar.gz | |
Manual merge from mysql-trunk.
Conflicts:
- scripts/CMakeLists.txt
Diffstat (limited to 'cmake/os')
| -rw-r--r-- | cmake/os/AIX.cmake | 4 | ||||
| -rw-r--r-- | cmake/os/WindowsCache.cmake | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/cmake/os/AIX.cmake b/cmake/os/AIX.cmake index b1b2cebdd14..c08cbbdc0cf 100644 --- a/cmake/os/AIX.cmake +++ b/cmake/os/AIX.cmake @@ -28,6 +28,6 @@ INCLUDE(CheckCXXCompilerFlag) # The following is required to export all symbols # (also with leading underscore) STRING(REPLACE "-bexpall" "-bexpfull" CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS - ${CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS}") + "${CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS}") STRING(REPLACE "-bexpall" "-bexpfull" CMAKE_SHARED_LIBRARY_LINK_C_FLAGS - "${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS}")
\ No newline at end of file + "${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS}") diff --git a/cmake/os/WindowsCache.cmake b/cmake/os/WindowsCache.cmake index e07e3f54aa8..81942a8c053 100644 --- a/cmake/os/WindowsCache.cmake +++ b/cmake/os/WindowsCache.cmake @@ -262,7 +262,6 @@ SET(HAVE_SYS_DIR_H CACHE INTERNAL "") SET(HAVE_SYS_ERRLIST CACHE INTERNAL "") SET(HAVE_SYS_FILE_H CACHE INTERNAL "") SET(HAVE_SYS_FPU_H CACHE INTERNAL "") -SET(HAVE_SYS_IOCTL CACHE INTERNAL "") SET(HAVE_SYS_IOCTL_H CACHE INTERNAL "") SET(HAVE_SYS_IPC_H CACHE INTERNAL "") SET(HAVE_SYS_MALLOC_H CACHE INTERNAL "") |