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 /dbug | |
| 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 'dbug')
| -rw-r--r-- | dbug/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dbug/CMakeLists.txt b/dbug/CMakeLists.txt index a4f30f75f97..fddf234a4f1 100644 --- a/dbug/CMakeLists.txt +++ b/dbug/CMakeLists.txt @@ -27,7 +27,7 @@ TARGET_LINK_LIBRARIES(tests dbug) ADD_EXECUTABLE(factorial my_main.c factorial.c) TARGET_LINK_LIBRARIES(factorial dbug) -IF(NOT WIN32) +IF(NOT WIN32 AND NOT CMAKE_GENERATOR MATCHES Xcode) FIND_PROGRAM(GROFF groff) FIND_PROGRAM(NROFF nroff) SET(OUTPUT_INC output1.r output2.r output3.r output4.r output5.r) @@ -63,5 +63,5 @@ IF(NOT WIN32) ADD_CUSTOM_TARGET(t ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/user.t) ENDIF(NROFF) -ENDIF(NOT WIN32) +ENDIF() |