Revision: 41176
http://brlcad.svn.sourceforge.net/brlcad/?rev=41176&view=rev
Author: starseeker
Date: 2010-10-29 18:13:45 +0000 (Fri, 29 Oct 2010)
Log Message:
-----------
Move more logic into SC macros, add a few more of the simpler tests. Once this
is all set up, need to do a line-by-line comparison with regular build system
tests to ensure we're doing them correctly.
Modified Paths:
--------------
brlcad/branches/cmake/src/other/tcl/CMake/tcl.cmake
brlcad/branches/cmake/src/other/tcl/CMakeLists.txt
Modified: brlcad/branches/cmake/src/other/tcl/CMake/tcl.cmake
===================================================================
--- brlcad/branches/cmake/src/other/tcl/CMake/tcl.cmake 2010-10-29 18:11:59 UTC
(rev 41175)
+++ brlcad/branches/cmake/src/other/tcl/CMake/tcl.cmake 2010-10-29 18:13:45 UTC
(rev 41176)
@@ -305,16 +305,25 @@
#--------------------------------------------------------------------
# SC_BLOCKING_STYLE
#--------------------------------------------------------------------
+CHECK_INCLUDE_FILE_D(sys/ioctl.h HAVE_SYS_IOCTL_H)
+CHECK_INCLUDE_FILE_D(sys/filio.h HAVE_SYS_FILIO_H)
+IF(${CMAKE_SYSTEM_NAME} MATCHES "^OSF.*")
+ ADD_TCL_CFLAG(USE_FIONBIO)
+ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "^OSF.*")
+IF(${CMAKE_SYSTEM_NAME} MATCHES "^SunOS$")
+ STRING(REGEX REPLACE "\\..*" "" CMAKE_SYSTEM_MAJOR_VERSION
${CMAKE_SYSTEM_VERSION})
+ IF (${CMAKE_SYSTEM_MAJOR_VERSION} LESS 5)
+ ADD_TCL_CFLAG(USE_FIONBIO)
+ ENDIF (${CMAKE_SYSTEM_MAJOR_VERSION} LESS 5)
+ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "^SunOS$")
-# TODO
-
#--------------------------------------------------------------------
# SC_TIME_HANLDER
#
# The TEA version of this macro calls AC_HEADER_TIME, but Autotools
# docs list it as obsolete.
#
-# TODO - tzname testing is incomplete
+# TODO - tzname testing from AC_STRUCT_TIMEZONE is incomplete
#
#--------------------------------------------------------------------
MACRO(SC_TIME_HANDLER)
@@ -341,10 +350,131 @@
CHECK_FUNCTION_EXISTS_D(mktime HAVE_MKTIME)
CHECK_STRUCT_HAS_MEMBER_D("struct tm" tm_tzadj time.h HAVE_TM_TZADJ)
CHECK_STRUCT_HAS_MEMBER_D("struct tm" tm_gmtoff time.h HAVE_TM_GMTOFF)
+ SET(TZONE_SRC_1 "
+#include <time.h>
+int main () {
+extern long timezone;
+timezone += 1;
+exit (0);
+return 0;
+}
+ ")
+ CHECK_C_SOURCE_COMPILES("${TZONE_SRC_1}" HAVE_TIMEZONE_VAR)
+ IF(HAVE_TIMEZONE_VAR)
+ ADD_TCL_CFLAG(HAVE_TIMEZONE_VAR)
+ ELSE(HAVE_TIMEZONE_VAR)
+ SET(TZONE_SRC_2 "
+#include <time.h>
+int main() {
+extern time_t timezone;
+timezone += 1;
+exit (0);
+return 0;
+}
+ ")
+ CHECK_C_SOURCE_COMPILES("${TZONE_SRC_2}" HAVE_TIMEZONE_VAR)
+ IF(HAVE_TIMEZONE_VAR)
+ ADD_TCL_CFLAG(HAVE_TIMEZONE_VAR)
+ ENDIF(HAVE_TIMEZONE_VAR)
+ ENDIF(HAVE_TIMEZONE_VAR)
ENDMACRO(SC_TIME_HANDLER)
+#--------------------------------------------------------------------
+# SC_BUGGY_STRTOD
+#--------------------------------------------------------------------
+# TODO
+
+#--------------------------------------------------------------------
+# SC_TCL_LINK_LIBS
+#--------------------------------------------------------------------
+MACRO(SC_TCL_LINK_LIBS)
+ CHECK_FUNCTION_EXISTS(sin, HAVE_MATHLIB)
+ IF(NOT HAVE_MATHLIB)
+ CHECK_LIBRARY(M m sin)
+ ENDIF(NOT HAVE_MATHLIB)
+ IF(NOT IEEE_LIBRARY AND NOT IEEE_QUIET)
+ MESSAGE("-- Looking for IEEE library")
+ RESOLVE_LIBRARIES(IEEE_LIBRARY "-lieee")
+ IF(IEEE_LIBRARY)
+ MESSAGE("-- Found IEEE library: ${IEEE_LIBRARY}")
+ ELSE(IEEE_LIBRARY)
+ MESSAGE("-- Looking for IEEE library - not found")
+ ENDIF(IEEE_LIBRARY)
+ SET(IEEE_QUIET 1 CACHE STRING "IEEE quiet")
+ ENDIF(NOT IEEE_LIBRARY AND NOT IEEE_QUIET)
+ IF(NOT INET_LIBRARY AND NOT INET_QUIET)
+ MESSAGE("-- Looking for INET library")
+ RESOLVE_LIBRARIES(INET_LIBRARY "-linet")
+ IF(INET_LIBRARY)
+ MESSAGE("-- Found INET library: ${INET_LIBRARY}")
+ ELSE(INET_LIBRARY)
+ MESSAGE("-- Looking for INET library - not found")
+ ENDIF(INET_LIBRARY)
+ SET(INET_QUIET 1 CACHE STRING "INET quiet")
+ ENDIF(NOT INET_LIBRARY AND NOT INET_QUIET)
+
+ SET(TCL_LINK_LIBS ${TCL_LINK_LIBS} ${IEEE_LIBRARY} ${M_LIBRARY}
${INET_LIBRARY} CACHE STRING "TCL CFLAGS" FORCE)
+
+ CHECK_INCLUDE_FILE_USABILITY_D(net/errno.h NET_ERRNO_H)
+ CHECK_FUNCTION_EXISTS(connect HAVE_CONNECT)
+ IF(NOT HAVE_CONNECT)
+ CHECK_FUNCTION_EXISTS(setsockopt HAVE_SETSOCKOPT)
+ IF(NOT HAVE_SETSOCKOPT)
+ CHECK_LIBRARY(SOCKET socket setsocket)
+ SET(TCL_LINK_LIBS ${TCL_LINK_LIBS} ${SOCKET_LIBRARY}
CACHE STRING "TCL CFLAGS" FORCE)
+ ENDIF(NOT HAVE_SETSOCKOPT)
+ ENDIF(NOT HAVE_CONNECT)
+ CHECK_FUNCTION_EXISTS(gethostbyname HAVE_GETHOSTBYNAME)
+ IF(NOT HAVE_GETHOSTBYNAME)
+ CHECK_LIBRARY(NLS nls gethostbyname)
+ SET(TCL_LINK_LIBS ${TCL_LINK_LIBS} ${NLS_LIBRARY} CACHE STRING
"TCL CFLAGS" FORCE)
+ ENDIF(NOT HAVE_GETHOSTBYNAME)
+
+ENDMACRO(SC_TCL_LINK_LIBS)
+
+#--------------------------------------------------------------------
+# SC_TCL_EARLY_FLAGS
+#--------------------------------------------------------------------
+
+# TODO - needed at all for CMake?
+
+#--------------------------------------------------------------------
+# SC_TCL_64BIT_FLAGS
+#
+# Detect and set up 64 bit compiling here. LOTS of TODO here
+#--------------------------------------------------------------------
+MACRO(SC_TCL_64BIT_FLAGS)
+ OPTION(ENABLE_64_BIT "64 bit void pointer" ON)
+ IF(${CMAKE_SIZEOF_VOID_P} MATCHES "^8$" AND ENABLE_64_BIT)
+ IF(ENABLE_64_BIT)
+ IF(NOT 64BIT_FLAG)
+ MESSAGE("Checking for 64-bit support:")
+ CHECK_C_FLAG("arch x86_64" 64BIT_FLAG)
+ CHECK_C_FLAG(64 64BIT_FLAG)
+ CHECK_C_FLAG("mabi=64" 64BIT_FLAG)
+ CHECK_C_FLAG(m64 64BIT_FLAG)
+ CHECK_C_FLAG(q64 64BIT_FLAG)
+ ENDIF(NOT 64BIT_FLAG)
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${64BIT_FLAG}"
CACHE STRING "CMake CFLAGS" FORCE)
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${64BIT_FLAG}"
CACHE STRING "CMake CXXFLAGS" FORCE)
+ ENDIF(ENABLE_64_BIT)
+ ELSE(${CMAKE_SIZEOF_VOID_P} MATCHES "^8$" AND ENABLE_64_BIT)
+ SET(ENABLE_64_BIT OFF)
+ ENDIF(${CMAKE_SIZEOF_VOID_P} MATCHES "^8$" AND ENABLE_64_BIT)
+ENDMACRO(SC_TCL_64BIT_FLAGS)
+
+#--------------------------------------------------------------------
+# SC_TCL_CFG_ENCODING TIP #59
+#--------------------------------------------------------------------
+MACRO(SC_TCL_CFG_ENCODING)
+ IF(NOT TCL_CFGVAL_ENCODING)
+ SET(TCL_CFGVAL_ENCODING "iso8859-1")
+ ENDIF(NOT TCL_CFGVAL_ENCODING)
+ SET(TCL_CFLAGS "${TCL_CFLAGS}
-DTCL_CFGVAL_ENCODING=\"${TCL_CFGVAL_ENCODING}\"" CACHE STRING "TCL CFLAGS"
FORCE)
+ENDMACRO(SC_TCL_CFG_ENCODING)
+
MACRO(CHECK_FD_SET_IN_TYPES_D)
SET(TEST_SRC "
#include <sys/types.h>
Modified: brlcad/branches/cmake/src/other/tcl/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tcl/CMakeLists.txt 2010-10-29 18:11:59 UTC
(rev 41175)
+++ brlcad/branches/cmake/src/other/tcl/CMakeLists.txt 2010-10-29 18:13:45 UTC
(rev 41176)
@@ -155,76 +155,15 @@
SC_ENABLE_THREADS()
-# SC_TCL_CFG_ENCODING
-IF(NOT TCL_CFGVAL_ENCODING)
- SET(TCL_CFGVAL_ENCODING "iso8859-1")
-ENDIF(NOT TCL_CFGVAL_ENCODING)
-SET(TCL_CFLAGS "${TCL_CFLAGS}
-DTCL_CFGVAL_ENCODING=\"${TCL_CFGVAL_ENCODING}\"")
+SC_TCL_CFG_ENCODING()
-# SC_TCL_LINK_LIBS
-CHECK_LIBRARY(M m sin)
-IF(NOT IEEE_LIBRARY AND NOT IEEE_QUIET)
-MESSAGE("-- Looking for IEEE library")
-RESOLVE_LIBRARIES(IEEE_LIBRARY "-lieee")
-IF(IEEE_LIBRARY)
- MESSAGE("-- Found IEEE library: ${IEEE_LIBRARY}")
-ELSE(IEEE_LIBRARY)
- MESSAGE("-- Looking for IEEE library - not found")
-ENDIF(IEEE_LIBRARY)
-SET(IEEE_QUIET 1 CACHE STRING "IEEE quiet")
-ENDIF(NOT IEEE_LIBRARY AND NOT IEEE_QUIET)
-IF(NOT INET_LIBRARY AND NOT INET_QUIET)
-MESSAGE("-- Looking for INET library")
-RESOLVE_LIBRARIES(INET_LIBRARY "-linet")
-IF(INET_LIBRARY)
- MESSAGE("-- Found INET library: ${INET_LIBRARY}")
-ELSE(INET_LIBRARY)
- MESSAGE("-- Looking for INET library - not found")
-ENDIF(INET_LIBRARY)
-SET(INET_QUIET 1 CACHE STRING "INET quiet")
-ENDIF(NOT INET_LIBRARY AND NOT INET_QUIET)
+SC_TCL_LINK_LIBS()
-SET(TCL_LINK_LIBS ${IEEE_LIBRARY} ${M_LIBRARY} ${INET_LIBRARY})
-CHECK_INCLUDE_FILE_USABILITY_D(net/errno.h NET_ERRNO_H)
-CHECK_FUNCTION_EXISTS(connect HAVE_CONNECT)
-IF(NOT HAVE_CONNECT)
- CHECK_FUNCTION_EXISTS(setsockopt HAVE_SETSOCKOPT)
- IF(NOT HAVE_SETSOCKOPT)
- CHECK_LIBRARY(SOCKET socket setsocket)
- SET(TCL_LINK_LIBS ${TCL_LINK_LIBS} ${SOCKET_LIBRARY})
- ENDIF(NOT HAVE_SETSOCKOPT)
-ENDIF(NOT HAVE_CONNECT)
-CHECK_FUNCTION_EXISTS(gethostbyname HAVE_GETHOSTBYNAME)
-IF(NOT HAVE_GETHOSTBYNAME)
- CHECK_LIBRARY(NLS nls gethostbyname)
- SET(TCL_LINK_LIBS ${TCL_LINK_LIBS} ${NLS_LIBRARY})
-ENDIF(NOT HAVE_GETHOSTBYNAME)
-
# TODO - look over SC_ENABLE_SHARED, SC_CONFIG_CFLAGS and SC_ENABLE_SYMBOLS
# need to decide how much of that logic is needed
-# Detect and set up 64 bit compiling here. This is not as
-# comprehensive as tcl.m4 yet - lots of linker flags and
-# other specialized platform-specific stuff there.
-OPTION(ENABLE_64_BIT "64 bit void pointer" ON)
-IF(${CMAKE_SIZEOF_VOID_P} MATCHES "^8$" AND ENABLE_64_BIT)
- IF(ENABLE_64_BIT)
- IF(NOT 64BIT_FLAG)
- MESSAGE("Checking for 64-bit support:")
- CHECK_C_FLAG("arch x86_64" 64BIT_FLAG)
- CHECK_C_FLAG(64 64BIT_FLAG)
- CHECK_C_FLAG("mabi=64" 64BIT_FLAG)
- CHECK_C_FLAG(m64 64BIT_FLAG)
- CHECK_C_FLAG(q64 64BIT_FLAG)
- ENDIF(NOT 64BIT_FLAG)
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${64BIT_FLAG}")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${64BIT_FLAG}")
- ENDIF(ENABLE_64_BIT)
-ELSE(${CMAKE_SIZEOF_VOID_P} MATCHES "^8$" AND ENABLE_64_BIT)
- SET(ENABLE_64_BIT OFF)
-ENDIF(${CMAKE_SIZEOF_VOID_P} MATCHES "^8$" AND ENABLE_64_BIT)
+SC_TCL_64BIT_FLAGS()
-
# Test endianness
INCLUDE(TestBigEndian)
TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
@@ -595,11 +534,8 @@
CHECK_INCLUDE_FILE_D(copyfile.h HAVE_COPYFILE_H)
CHECK_FUNCTION_EXISTS_D(copyfile HAVE_COPYFILE)
-CHECK_INCLUDE_FILE_D(sys/ioctl.h HAVE_SYS_IOCTL_H)
-CHECK_INCLUDE_FILE_D(sys/filio.h HAVE_SYS_FILIO_H)
-
CHECK_TYPE_SIZE_D(blkcnt_t HAVE_BLKCNT_T)
CHECK_TYPE_SIZE_D(intptr_t HAVE_INTPTR_T)
CHECK_TYPE_SIZE_D(uintptr_t HAVE_UINTPTR_T)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
