Revision: 40912
http://brlcad.svn.sourceforge.net/brlcad/?rev=40912&view=rev
Author: starseeker
Date: 2010-10-07 01:55:15 +0000 (Thu, 07 Oct 2010)
Log Message:
-----------
Go ahead and put back the working tests - a basic dirent.h test should be
sufficient these days, so don't spend any more effort on it.
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/misc/CMake/BRLCAD_CheckFunctions.cmake
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2010-10-07 01:28:13 UTC (rev
40911)
+++ brlcad/branches/cmake/CMakeLists.txt 2010-10-07 01:55:15 UTC (rev
40912)
@@ -599,6 +599,7 @@
find_library(COREFOUNDATION_FRAMEWORK CoreFoundation)
INCLUDE(${BRLCAD_CMAKE_DIR}/FindCarbon.cmake)
INCLUDE(${BRLCAD_CMAKE_DIR}/FindCocoa.cmake)
+ BRLCAD_INCLUDE_FILE(Carbon/Carbon.h HAVE_CARBON_CARBON_H)
ENDIF(APPLE)
# crypt library (needed on some platforms for enigma)
@@ -709,9 +710,17 @@
# syslog.h, tar.h, termios.h, trace.h, ucontext.h, ulimit.h, unistd.h,
# utime.h, utmpx.h, wordexp.h
+# Tests for standard functionality based on AC_HEADER_* macros (see
+# http://www.gnu.org/software/hello/manual/autoconf/Particular-Headers.html)
+# AC_HEADER_STDC
+CMAKE_HEADER_STDC()
+# AC_HEADER_SYS_WAIT
+CMAKE_HEADER_SYS_WAIT()
+
# Need to compare this with the configure.ac list
BRLCAD_INCLUDE_FILE(alloca.h HAVE_ALLOCA_H)
BRLCAD_INCLUDE_FILE(dslib.h HAVE_DSLIB_H)
+BRLCAD_INCLUDE_FILE(dirent.h HAVE_DIRENT_H)
BRLCAD_INCLUDE_FILE(getopt.h HAVE_GETOPT_H)
BRLCAD_INCLUDE_FILE(gl/device.h HAVE_GL_DEVICE_H)
BRLCAD_INCLUDE_FILE(grp.h HAVE_GRP_H)
Modified: brlcad/branches/cmake/misc/CMake/BRLCAD_CheckFunctions.cmake
===================================================================
--- brlcad/branches/cmake/misc/CMake/BRLCAD_CheckFunctions.cmake
2010-10-07 01:28:13 UTC (rev 40911)
+++ brlcad/branches/cmake/misc/CMake/BRLCAD_CheckFunctions.cmake
2010-10-07 01:55:15 UTC (rev 40912)
@@ -76,3 +76,27 @@
ENDIF(HAVE_DIRNAME)
ENDMACRO(CHECK_DIRNAME var)
+INCLUDE (CheckPrototypeExists)
+INCLUDE (CheckCFileRuns)
+# Based on AC_HEADER_STDC - using the source code for ctype
+# checking found in the generated configure file
+MACRO(CMAKE_HEADER_STDC)
+ CHECK_INCLUDE_FILE(stdlib.h HAVE_STDLIB_H)
+ CHECK_INCLUDE_FILE(stdarg.h HAVE_STDARG_H)
+ CHECK_INCLUDE_FILE(string.h HAVE_STRING_H)
+ CHECK_INCLUDE_FILE(float.h HAVE_FLOAT_H)
+ CHECK_PROTOTYPE_EXISTS(memchr string.h HAVE_STRING_H_MEMCHR)
+ CHECK_PROTOTYPE_EXISTS(free stdlib.h HAVE_STDLIB_H_FREE)
+ CHECK_C_FILE_RUNS(${CMAKE_SOURCE_DIR}/misc/CMake/test_srcs/ctypes_test.c
WORKING_CTYPE_MACROS)
+ IF(HAVE_STDLIB_H AND HAVE_STDARG_H AND HAVE_STRING_H AND HAVE_FLOAT_H AND
WORKING_CTYPE_MACROS)
+ FILE(APPEND ${CONFIG_H_FILE} "#define STDC_HEADERS 1\n")
+ ENDIF(HAVE_STDLIB_H AND HAVE_STDARG_H AND HAVE_STRING_H AND HAVE_FLOAT_H AND
WORKING_CTYPE_MACROS)
+ENDMACRO(CMAKE_HEADER_STDC)
+
+# Based on AC_HEADER_SYS_WAIT
+MACRO(CMAKE_HEADER_SYS_WAIT)
+ CHECK_C_FILE_RUNS(${CMAKE_SOURCE_DIR}/misc/CMake/test_srcs/sys_wait_test.c
WORKING_SYS_WAIT)
+ IF(WORKING_SYS_WAIT)
+ FILE(APPEND ${CONFIG_H_FILE} "#define HAVE_SYS_WAIT_H 1\n")
+ ENDIF(WORKING_SYS_WAIT)
+ENDMACRO(CMAKE_HEADER_SYS_WAIT)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
