Revision: 40911
http://brlcad.svn.sourceforge.net/brlcad/?rev=40911&view=rev
Author: starseeker
Date: 2010-10-07 01:28:13 +0000 (Thu, 07 Oct 2010)
Log Message:
-----------
Don't duplicate obsolete Autoconf functionality unless there is a compelling
reason
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:18:14 UTC (rev
40910)
+++ brlcad/branches/cmake/CMakeLists.txt 2010-10-07 01:28:13 UTC (rev
40911)
@@ -676,21 +676,6 @@
# IRIX libgen library
BRLCAD_CHECK_LIBRARY(GEN gen basename)
-# check if the standard c++ library links without checking for any particular
symbol
-# library is needed when linking c++ code against c code (e.g. openNURBS)
-#CHECK_LIBRARY_EXISTS(stdc++ main "" HAVE_STDCXX)
-#IF(HAVE_STDCXX)
-# RESOLVE_LIBRARIES(STDCXX_LIBRARY "-lstdc++")
-# SET(STDCXX_LINKOPT "-lstdc++")
-#ELSE(HAVE_STDCXX)
-# CHECK_LIBRARY_EXISTS(stdc++ main "${M_LINNKOPT}" HAVE_STDCXX_M)
-# IF(HAVE_STDCXX_M)
-# RESOLVE_LIBRARIES(STDCXX_LIBRARY "-lstdc++ ${M_LINNKOPT}")
-# SET(STDCXX_LINKOPT "-lstdc++ ${M_LINNKOPT}")
-# ENDIF(HAVE_STDCXX_M)
-#ENDIF(HAVE_STDCXX)
-FILE(APPEND ${CONFIG_H_FILE} "#define HAVE_STDCXX 1\n")
-
# *******************************************************************
# *** Check for Headers - Stage 4 of 9 ***
# *******************************************************************
@@ -724,15 +709,6 @@
# 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_DIRENT - not yet fully at parity with its autotools counterpart
-CMAKE_HEADER_DIRENT()
-# 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)
Modified: brlcad/branches/cmake/misc/CMake/BRLCAD_CheckFunctions.cmake
===================================================================
--- brlcad/branches/cmake/misc/CMake/BRLCAD_CheckFunctions.cmake
2010-10-07 01:18:14 UTC (rev 40910)
+++ brlcad/branches/cmake/misc/CMake/BRLCAD_CheckFunctions.cmake
2010-10-07 01:28:13 UTC (rev 40911)
@@ -76,41 +76,3 @@
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_DIRENT
-MACRO(CMAKE_HEADER_DIRENT)
- BRLCAD_INCLUDE_FILE(dirent.h HAVE_DIRENT_H)
- IF(NOT HAVE_DIRENT_H)
- BRLCAD_INCLUDE_FILE(sys/ndir.h HAVE_SYS_NDIR_H)
- IF(NOT HAVE_SYS_NDIR_H)
- BRLCAD_INCLUDE_FILE(sys/dir.h HAVE_SYS_DIR_H)
- IF(NOT HAVE_SYS_DIR_H)
- BRLCAD_INCLUDE_FILE(ndir.h HAVE_NDIR_H)
- ENDIF(NOT HAVE_SYS_DIR_H)
- ENDIF(NOT HAVE_SYS_NDIR_H)
- ENDIF(NOT HAVE_DIRENT_H)
-ENDMACRO(CMAKE_HEADER_DIRENT)
-
-# 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
