Revision: 40929
http://brlcad.svn.sourceforge.net/brlcad/?rev=40929&view=rev
Author: starseeker
Date: 2010-10-07 15:44:18 +0000 (Thu, 07 Oct 2010)
Log Message:
-----------
Add some more checks for header files.
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/src/other/openNURBS/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2010-10-07 15:10:14 UTC (rev
40928)
+++ brlcad/branches/cmake/CMakeLists.txt 2010-10-07 15:44:18 UTC (rev
40929)
@@ -717,11 +717,13 @@
CMAKE_HEADER_STDC()
# AC_HEADER_SYS_WAIT
CMAKE_HEADER_SYS_WAIT()
+# dirent.h is POSIX.1, but not present on Windows (grr)
+# so we need to check for it
+BRLCAD_INCLUDE_FILE(dirent.h HAVE_DIRENT_H)
# 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)
@@ -743,8 +745,10 @@
BRLCAD_INCLUDE_FILE(sys/ioctl_compat.h HAVE_SYS_IOCTL_COMPAT_H)
BRLCAD_INCLUDE_FILE(sys/machd.h HAVE_SYS_MACHD_H)
BRLCAD_INCLUDE_FILE(sys/mman.h HAVE_SYS_MMAN_H)
+BRLCAD_INCLUDE_FILE(sys/mount.h HAVE_SYS_MOUNT_H)
BRLCAD_INCLUDE_FILE(sys/param.h HAVE_SYS_PARAM_H)
BRLCAD_INCLUDE_FILE(sys/prctl.h HAVE_SYS_PRCTL_H)
+BRLCAD_INCLUDE_FILE(sys/sched.h HAVE_SYS_SCHED_H)
BRLCAD_INCLUDE_FILE(sys/select.h HAVE_SYS_SELECT_H)
BRLCAD_INCLUDE_FILE(sys/socket.h HAVE_SYS_SOCKET_H)
BRLCAD_INCLUDE_FILE(sys/stat.h HAVE_SYS_STAT_H)
@@ -762,6 +766,7 @@
BRLCAD_INCLUDE_FILE(termio.h HAVE_TERMIO_H)
BRLCAD_INCLUDE_FILE(termios.h HAVE_TERMIOS_H)
BRLCAD_INCLUDE_FILE(termlib.h HAVE_TERMLIB_H)
+BRLCAD_INCLUDE_FILE(term.h HAVE_TERM_H)
BRLCAD_INCLUDE_FILE(tinfo.h HAVE_TINFO_H)
BRLCAD_INCLUDE_FILE(ulocks.h HAVE_ULOCKS_H)
BRLCAD_INCLUDE_FILE(unistd.h HAVE_UNISTD_H)
@@ -794,6 +799,7 @@
# *******************************************************************
BRLCAD_FUNCTION_EXISTS(XQueryExtension HAVE_XQUERYEXTENSION)
BRLCAD_FUNCTION_EXISTS(alarm HAVE_ALARM)
+# TODO - this test isn't working and it should - look into AC macro for ALLOCA
BRLCAD_FUNCTION_EXISTS(alloca HAVE_ALLOCA)
BRLCAD_FUNCTION_EXISTS(dlopen HAVE_DLOPEN)
BRLCAD_FUNCTION_EXISTS(drand48 HAVE_DRAND48)
Modified: brlcad/branches/cmake/src/other/openNURBS/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/openNURBS/CMakeLists.txt 2010-10-07
15:10:14 UTC (rev 40928)
+++ brlcad/branches/cmake/src/other/openNURBS/CMakeLists.txt 2010-10-07
15:44:18 UTC (rev 40929)
@@ -220,6 +220,16 @@
opennurbs_dll_resource.h
)
+INCLUDE(CheckIncludeFiles)
+CHECK_INCLUDE_FILE(emmintrin.h HAVE_EMMINTRIN_H)
+CHECK_INCLUDE_FILE(ieeefp.h HAVE_IEEEFP_H)
+if(CONFIG_H_FILE)
+ FILE(APPEND ${CONFIG_H_FILE} "#cmakedefine HAVE_EMMINTRIN_H 1\n")
+ FILE(APPEND ${CONFIG_H_FILE} "#cmakedefine HAVE_IEEEFP_H 1\n")
+endif(CONFIG_H_FILE)
+
+
+
set(OPENNURBS_LINKLIBRARIES
${ZLIB_LIBRARY}
)
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
