Revision: 40932
http://brlcad.svn.sourceforge.net/brlcad/?rev=40932&view=rev
Author: starseeker
Date: 2010-10-07 17:16:57 +0000 (Thu, 07 Oct 2010)
Log Message:
-----------
add a few defines present in the autotools build - getting closer. Lot of
specialized AC macros to duplicate for types, although AC_C_CHAR_UNSIGNED is
considered obsolete and won't be ported - only tcl/tk seem to use it in our
code, and their build systems can handle 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 17:02:44 UTC (rev
40931)
+++ brlcad/branches/cmake/CMakeLists.txt 2010-10-07 17:16:57 UTC (rev
40932)
@@ -789,13 +789,19 @@
# *** Check for Types/Structures - Stage 5 of 9 ***
# *******************************************************************
-BRLCAD_TYPE_SIZE("ssize_t" SSIZE_T)
-BRLCAD_TYPE_SIZE("uint64_t" UINT64_T)
-BRLCAD_TYPE_SIZE("uintptr_t" UINTPTR_T)
-BRLCAD_TYPE_SIZE("sig_t" SIG_T)
+# socklen_t
+BRLCAD_TYPE_SIZE("socklen_t" SOCKLEN_T "sys/types.h")
+IF(NOT SOCKLEN_T)
+ BRLCAD_TYPE_SIZE("socklen_t" SOCKLEN_T "sys/socket.h")
+ENDIF(NOT SOCKLEN_T)
+BRLCAD_TYPE_SIZE("ssize_t" SSIZE_T "")
+BRLCAD_TYPE_SIZE("uint64_t" UINT64_T "")
+BRLCAD_TYPE_SIZE("uintptr_t" UINTPTR_T "")
+BRLCAD_TYPE_SIZE("sig_t" SIG_T "signal.h")
+
# *******************************************************************
# *** Check for Compile Characteristics - Stage 6 of 9 ***
# *******************************************************************
@@ -806,7 +812,7 @@
# *** Check for Functions - Stage 7 of 9 ***
# *******************************************************************
-# ALLOCA
+# ALLOCA test - based on AC_FUNC_ALLOCA
CMAKE_ALLOCA()
BRLCAD_FUNCTION_EXISTS(XQueryExtension HAVE_XQUERYEXTENSION)
Modified: brlcad/branches/cmake/misc/CMake/BRLCAD_CheckFunctions.cmake
===================================================================
--- brlcad/branches/cmake/misc/CMake/BRLCAD_CheckFunctions.cmake
2010-10-07 17:02:44 UTC (rev 40931)
+++ brlcad/branches/cmake/misc/CMake/BRLCAD_CheckFunctions.cmake
2010-10-07 17:16:57 UTC (rev 40932)
@@ -10,30 +10,32 @@
MACRO(BRLCAD_FUNCTION_EXISTS function var)
CHECK_FUNCTION_EXISTS(${function} ${var})
- if(CONFIG_H_FILE)
+ if(CONFIG_H_FILE AND ${var})
FILE(APPEND ${CONFIG_H_FILE} "#cmakedefine ${var} 1\n")
- endif(CONFIG_H_FILE)
+ endif(CONFIG_H_FILE AND ${var})
ENDMACRO(BRLCAD_FUNCTION_EXISTS)
MACRO(BRLCAD_INCLUDE_FILE filename var)
CHECK_INCLUDE_FILE(${filename} ${var})
- if(CONFIG_H_FILE)
+ if(CONFIG_H_FILE AND ${var})
FILE(APPEND ${CONFIG_H_FILE} "#cmakedefine ${var} 1\n")
- endif(CONFIG_H_FILE)
+ endif(CONFIG_H_FILE AND ${var})
ENDMACRO(BRLCAD_INCLUDE_FILE)
MACRO(BRLCAD_INCLUDE_FILE_CXX filename var)
CHECK_INCLUDE_FILE_CXX(${filename} ${var})
- if(CONFIG_H_FILE)
+ if(CONFIG_H_FILE AND ${var})
FILE(APPEND ${CONFIG_H_FILE} "#cmakedefine ${var} 1\n")
- endif(CONFIG_H_FILE)
+ endif(CONFIG_H_FILE AND ${var})
ENDMACRO(BRLCAD_INCLUDE_FILE_CXX)
-MACRO(BRLCAD_TYPE_SIZE typename var)
- CHECK_TYPE_SIZE(${typename} ${var})
- if(CONFIG_H_FILE)
- FILE(APPEND ${CONFIG_H_FILE} "#cmakedefine HAVE_${var} 1\n")
- endif(CONFIG_H_FILE)
+MACRO(BRLCAD_TYPE_SIZE typename var header)
+ SET(CMAKE_EXTRA_INCLUDE_FILES ${header})
+ CHECK_TYPE_SIZE(${typename} ${var})
+ SET(CMAKE_EXTRA_INCLUDE_FILES)
+ if(CONFIG_H_FILE AND ${var})
+ FILE(APPEND ${CONFIG_H_FILE} "#cmakedefine HAVE_${var} 1\n")
+ endif(CONFIG_H_FILE AND ${var})
ENDMACRO(BRLCAD_TYPE_SIZE)
MACRO(BRLCAD_CHECK_LIBRARY targetname lname func)
@@ -82,8 +84,12 @@
# checking found in the generated configure file
MACRO(CMAKE_HEADER_STDC)
CHECK_INCLUDE_FILE(stdlib.h HAVE_STDLIB_H)
+ FILE(APPEND ${CONFIG_H_FILE} "#cmakedefine HAVE_STDLIB_H 1\n")
CHECK_INCLUDE_FILE(stdarg.h HAVE_STDARG_H)
CHECK_INCLUDE_FILE(string.h HAVE_STRING_H)
+ FILE(APPEND ${CONFIG_H_FILE} "#cmakedefine HAVE_STRING_H 1\n")
+ CHECK_INCLUDE_FILE(strings.h HAVE_STRINGS_H)
+ FILE(APPEND ${CONFIG_H_FILE} "#cmakedefine HAVE_STRINGS_H 1\n")
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)
@@ -101,7 +107,7 @@
ENDIF(WORKING_SYS_WAIT)
ENDMACRO(CMAKE_HEADER_SYS_WAIT)
-# ALLOCA
+# Based on AC_FUNC_ALLOCA
MACRO(CMAKE_ALLOCA)
CHECK_C_FILE_RUNS(${CMAKE_SOURCE_DIR}/misc/CMake/test_srcs/alloca_header_test.c
WORKING_ALLOCA_H)
IF(WORKING_ALLOCA_H)
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
