make compilation succeed on macosx; this will still run macs out of disk space. Also, it disables a number of binaries that probably should be supported on macs.

This commit is contained in:
Sears Russell 2009-10-02 00:45:10 +00:00
parent 95d0df4a36
commit 0a1ca5e1cc
4 changed files with 17 additions and 1 deletions

View file

@ -71,6 +71,14 @@ int main(int argc, char * argv[]) {
}
" HAVE_O_DIRECT)
CHECK_C_SOURCE_COMPILES("#define _GNU_SOURCE
#include <stdio.h>
int main(int argc, char * argv[]) {
getline(0,0,0);
}
" HAVE_GETLINE)
MACRO(CREATE_CHECK NAME)
ADD_EXECUTABLE(${NAME} ${NAME}.c)
TARGET_LINK_LIBRARIES(${NAME} ${COMMON_LIBRARIES})

View file

@ -1,3 +1,4 @@
IF(HAVE_GETLINE)
ADD_EXECUTABLE(rose rose.cpp)
TARGET_LINK_LIBRARIES(rose ${COMMON_LIBRARIES})
@ -10,6 +11,9 @@ TARGET_LINK_LIBRARIES(roseTableTpcCH-workload1 ${COMMON_LIBRARIES})
ADD_EXECUTABLE(roseTableTpcCH-workload2 roseTableTpcCH-workload2.cpp)
TARGET_LINK_LIBRARIES(roseTableTpcCH-workload2 ${COMMON_LIBRARIES})
ENDIF(HAVE_GETLINE)
CREATE_EXECUTABLE(lhtableThreaded)
CREATE_EXECUTABLE(naiveHash)
CREATE_EXECUTABLE(naiveMultiThreaded)
@ -30,4 +34,4 @@ CREATE_EXECUTABLE(distributedLsnFree)
IF(CHECK_LIBRARY)
ADD_TEST(rose rose)
ENDIF(CHECK_LIBRARY)
CREATE_EXECUTABLE(slotted)
CREATE_EXECUTABLE(slotted)

View file

@ -1,3 +1,4 @@
if(HAVE_GETLINE)
SUBDIRS(lang)
ADD_LIBRARY(referential algebra.c dml.c ddl.c tuple.c lang/ast.c)
TARGET_LINK_LIBRARIES(referential ${COMMON_LIBRARIES})
@ -5,3 +6,4 @@ SET(COMMON_LIBRARIES referential refparse ${COMMON_LIBRARIES})
IF(CHECK_LIBRARY)
CREATE_CHECK_OPT(toplevel ${CMAKE_CURRENT_SOURCE_DIR}/test-script.ref)
ENDIF(CHECK_LIBRARY)
endif(HAVE_GETLINE)

View file

@ -1,3 +1,4 @@
IF(HAVE_GETLINE) # XXX HACK. Assume we're not on linux if we don't have getline, then don't even try to get this directory to build.
ADD_EXECUTABLE(check_faultInjection fitest.c fisubject.c fichecker.c)
TARGET_LINK_LIBRARIES(check_faultInjection ${COMMON_LIBRARIES})
@ -12,3 +13,4 @@ CONFIGURE_FILE(
COPYONLY
)
ADD_TEST(check_faultInjection check_faultInjection)
ENDIF(HAVE_GETLINE)