diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-04-12 01:33:43 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-04-12 01:33:43 +0200 |
| commit | f544b21fcb0a05caeb2e375d8156da890b34c88a (patch) | |
| tree | d3cc5ee45c9c637aeac0fab49a248c5e9d1d0c8b /configure.cmake | |
| parent | 9f010e3294696f589a3d8e4fb7799a7ffa282658 (diff) | |
| download | mariadb-git-f544b21fcb0a05caeb2e375d8156da890b34c88a.tar.gz | |
Fix build on OSX
- Workaround linker bug that prevents linking aria test executables
using -fno-common on OSX
- Skip system readline detection (OSX readline is incompatible one)
- Make Xcode generator work
Diffstat (limited to 'configure.cmake')
| -rw-r--r-- | configure.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.cmake b/configure.cmake index e635a770b41..bf2a08386ab 100644 --- a/configure.cmake +++ b/configure.cmake @@ -149,7 +149,9 @@ IF(UNIX) SET(CMAKE_REQUIRED_LIBRARIES ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT}) - LIST(REMOVE_DUPLICATES CMAKE_REQUIRED_LIBRARIES) + IF(CMAKE_REQUIRED_LIBRARIES) + LIST(REMOVE_DUPLICATES CMAKE_REQUIRED_LIBRARIES) + ENDIF() LINK_LIBRARIES(${CMAKE_THREAD_LIBS_INIT}) OPTION(WITH_LIBWRAP "Compile with tcp wrappers support" OFF) |