Revision: 41201
http://brlcad.svn.sourceforge.net/brlcad/?rev=41201&view=rev
Author: starseeker
Date: 2010-11-01 16:45:46 +0000 (Mon, 01 Nov 2010)
Log Message:
-----------
More tweaking - trying to get back to building state. Not there yet.
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-11-01 15:38:59 UTC
(rev 41200)
+++ brlcad/branches/cmake/src/other/tcl/CMake/tcl.cmake 2010-11-01 16:45:46 UTC
(rev 41201)
@@ -328,7 +328,7 @@
#--------------------------------------------------------------------
MACRO(SC_TIME_HANDLER)
CHECK_INCLUDE_FILE_USABILITY_D(sys/time.h HAVE_SYS_TIME_H)
- CHECK_STRUCT_HAS_MEMBER_D("struct tm" tm_zone time.h
HAVE_STRUCT_TM_TM_ZONE)
+ CHECK_STRUCT_HAS_MEMBER_D("struct tm" tm_zone time.h STRUCT_TM_TM_ZONE)
IF(HAVE_STRUCT_TM_TM_ZONE)
ADD_TCL_CFLAG(HAVE_TM_ZONE)
ELSE(HAVE_STRUCT_TM_TM_ZONE)
@@ -348,8 +348,8 @@
CHECK_FUNCTION_EXISTS_D(gmtime_r HAVE_GMTIME_R)
CHECK_FUNCTION_EXISTS_D(localtime_r HAVE_LOCALTIME_R)
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)
+ CHECK_STRUCT_HAS_MEMBER_D("struct tm" tm_tzadj time.h TM_TZADJ)
+ CHECK_STRUCT_HAS_MEMBER_D("struct tm" tm_gmtoff time.h TM_GMTOFF)
SET(TZONE_SRC_1 "
#include <time.h>
int main () {
@@ -472,7 +472,7 @@
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)
+ SET(TCL_CFLAGS "${TCL_CFLAGS}
-DTCL_CFGVAL_ENCODING=\\\"${TCL_CFGVAL_ENCODING}\\\"" CACHE STRING "TCL CFLAGS"
FORCE)
ENDMACRO(SC_TCL_CFG_ENCODING)
Modified: brlcad/branches/cmake/src/other/tcl/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tcl/CMakeLists.txt 2010-11-01 15:38:59 UTC
(rev 41200)
+++ brlcad/branches/cmake/src/other/tcl/CMakeLists.txt 2010-11-01 16:45:46 UTC
(rev 41201)
@@ -113,25 +113,25 @@
#----------------------------------------------------------------------------
# First, get some standard options out of the way - things that are constant
# between various platforms or pertain to specific OS definitions
-SET(TCL_CFLAGS "${TCL_CFLAGS} -DPACKAGE_NAME=\"tcl\"")
-SET(TCL_CFLAGS "${TCL_CFLAGS} -DPACKAGE_TARNAME=\"tcl\"")
-SET(TCL_CFLAGS "${TCL_CFLAGS}
-DPACKAGE_VERSION=\"${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}\"")
-SET(TCL_CFLAGS "${TCL_CFLAGS} -DPACKAGE_STRING=\"tcl\\
${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}\"")
-SET(TCL_CFLAGS "${TCL_CFLAGS} -DPACKAGE_BUGREPORT=\"\"")
+SET(TCL_CFLAGS "${TCL_CFLAGS} -DPACKAGE_NAME=\\\"tcl\\\"")
+SET(TCL_CFLAGS "${TCL_CFLAGS} -DPACKAGE_TARNAME=\\\"tcl\\\"")
+SET(TCL_CFLAGS "${TCL_CFLAGS}
-DPACKAGE_VERSION=\\\"${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}\\\"")
+SET(TCL_CFLAGS "${TCL_CFLAGS} -DPACKAGE_STRING=\\\"tcl\\
${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}\\\"")
+SET(TCL_CFLAGS "${TCL_CFLAGS} -DPACKAGE_BUGREPORT=\\\"\\\"")
SET(TCL_CFLAGS "${TCL_CFLAGS} -DSTDC_HEADERS=1")
-SET(TCL_CFLAGS "${TCL_CFLAGS}
-DTCL_SHLIB_EXT=\"${CMAKE_SHARED_LIBRARY_SUFFIX}\"")
-SET(TCL_CFLAGS "${TCL_CFLAGS}
-DCFG_INSTALL_LIBDIR=\"${CMAKE_INSTALL_PREFIX}/lib\"")
-SET(TCL_CFLAGS "${TCL_CFLAGS}
-DCFG_INSTALL_BINDIR=\"${CMAKE_INSTALL_PREFIX}/bin\"")
-SET(TCL_CFLAGS "${TCL_CFLAGS}
-DCFG_INSTALL_SCRDIR=\"${CMAKE_INSTALL_PREFIX}/scripts\"")
-SET(TCL_CFLAGS "${TCL_CFLAGS}
-DCFG_INSTALL_INCDIR=\"${CMAKE_INSTALL_PREFIX}/include\"")
-SET(TCL_CFLAGS "${TCL_CFLAGS}
-DCFG_INSTALL_DOCDIR=\"${CMAKE_INSTALL_PREFIX}/share/man\"")
-SET(TCL_CFLAGS "${TCL_CFLAGS}
-DCFG_RUNTIME_LIBDIR=\"${CMAKE_INSTALL_PREFIX}/lib\"")
-SET(TCL_CFLAGS "${TCL_CFLAGS}
-DCFG_RUNTIME_BINDIR=\"${CMAKE_INSTALL_PREFIX}/bin\"")
-SET(TCL_CFLAGS "${TCL_CFLAGS}
-DCFG_RUNTIME_SCRDIR=\"${CMAKE_INSTALL_PREFIX}/scripts\"")
-SET(TCL_CFLAGS "${TCL_CFLAGS}
-DCFG_RUNTIME_INCDIR=\"${CMAKE_INSTALL_PREFIX}/include\"")
-SET(TCL_CFLAGS "${TCL_CFLAGS}
-DCFG_RUNTIME_DOCDIR=\"${CMAKE_INSTALL_PREFIX}/share/man\"")
-SET(TCL_CFLAGS "${TCL_CFLAGS}
-DTCL_LIBRARY=\"${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}\"")
-SET(TCL_CFLAGS "${TCL_CFLAGS}
-DTCL_PACKAGE_PATH=\"${CMAKE_INSTALL_PREFIX}/lib\"")
+SET(TCL_CFLAGS "${TCL_CFLAGS}
-DTCL_SHLIB_EXT=\\\"${CMAKE_SHARED_LIBRARY_SUFFIX}\\\"")
+SET(TCL_CFLAGS "${TCL_CFLAGS}
-DCFG_INSTALL_LIBDIR=\\\"${CMAKE_INSTALL_PREFIX}/lib\\\"")
+SET(TCL_CFLAGS "${TCL_CFLAGS}
-DCFG_INSTALL_BINDIR=\\\"${CMAKE_INSTALL_PREFIX}/bin\\\"")
+SET(TCL_CFLAGS "${TCL_CFLAGS}
-DCFG_INSTALL_SCRDIR=\\\"${CMAKE_INSTALL_PREFIX}/scripts\\\"")
+SET(TCL_CFLAGS "${TCL_CFLAGS}
-DCFG_INSTALL_INCDIR=\\\"${CMAKE_INSTALL_PREFIX}/include\\\"")
+SET(TCL_CFLAGS "${TCL_CFLAGS}
-DCFG_INSTALL_DOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/share/man\\\"")
+SET(TCL_CFLAGS "${TCL_CFLAGS}
-DCFG_RUNTIME_LIBDIR=\\\"${CMAKE_INSTALL_PREFIX}/lib\\\"")
+SET(TCL_CFLAGS "${TCL_CFLAGS}
-DCFG_RUNTIME_BINDIR=\\\"${CMAKE_INSTALL_PREFIX}/bin\\\"")
+SET(TCL_CFLAGS "${TCL_CFLAGS}
-DCFG_RUNTIME_SCRDIR=\\\"${CMAKE_INSTALL_PREFIX}/scripts\\\"")
+SET(TCL_CFLAGS "${TCL_CFLAGS}
-DCFG_RUNTIME_INCDIR=\\\"${CMAKE_INSTALL_PREFIX}/include\\\"")
+SET(TCL_CFLAGS "${TCL_CFLAGS}
-DCFG_RUNTIME_DOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/share/man\\\"")
+SET(TCL_CFLAGS "${TCL_CFLAGS}
-DTCL_LIBRARY=\\\"${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}\\\"")
+SET(TCL_CFLAGS "${TCL_CFLAGS}
-DTCL_PACKAGE_PATH=\\\"${CMAKE_INSTALL_PREFIX}/lib\\\"")
IF(APPLE)
@@ -183,6 +183,7 @@
CHECK_FUNCTION_EXISTS(opendir HAVE_OPENDIR)
IF(NOT HAVE_OPENDIR)
SET(COMPAT_SRCS ${COMPAT_SRCS} compat/opendir.c)
+ ADD_TCL_CFLAG(USE_DIRENT2_H)
ENDIF(NOT HAVE_OPENDIR)
CHECK_FUNCTION_EXISTS(strtol HAVE_STRTOL)
IF(NOT HAVE_STRTOL)
@@ -267,12 +268,13 @@
# Handle time
SC_TIME_HANDLER()
-# memove check
-CHECK_FUNCTION_EXISTS(memmove, HAVE_MEMMOVE)
-IF(NOT HAVE_MEMMOVE)
- SET(TCL_CFLAGS "${TCL_CFLAGS} -DNO_MEMMOVE=1")
- SET(TCL_CFLAGS "${TCL_CFLAGS} -DNO_STRING_H=1")
-ENDIF(NOT HAVE_MEMMOVE)
+# memove check - need to revisit this, not finding memmove
+# on OSX
+#CHECK_FUNCTION_EXISTS(memmove, HAVE_MEMMOVE)
+#IF(NOT HAVE_MEMMOVE)
+# SET(TCL_CFLAGS "${TCL_CFLAGS} -DNO_MEMMOVE=1")
+# SET(TCL_CFLAGS "${TCL_CFLAGS} -DNO_STRING_H=1")
+#ENDIF(NOT HAVE_MEMMOVE)
# Test for bad functions
@@ -291,6 +293,18 @@
)
+# Check for types - TODO: still need to define substitutes if these
+# are not found
+CHECK_TYPE_SIZE_D(mode_t MODE)
+CHECK_TYPE_SIZE_D(pid_t PID)
+CHECK_TYPE_SIZE_D(size_t SIZE)
+CHECK_TYPE_SIZE_D(uid_t UID)
+CHECK_TYPE_SIZE_D(blkcnt_t BLKCNT)
+CHECK_TYPE_SIZE_D(intptr_t INTPTR)
+CHECK_TYPE_SIZE_D(uintptr_t UINTPTR)
+
+
+
CHECK_INCLUDE_FILE_D(sys/types.h HAVE_SYS_TYPES_H)
CHECK_INCLUDE_FILE_D(sys/stat.h HAVE_SYS_STAT_H)
CHECK_INCLUDE_FILE_D(sys/fstatfs.h HAVE_SYS_FSTATFS_H)
@@ -323,9 +337,6 @@
-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)
CHECK_FUNCTION_EXISTS_D(getattrlist HAVE_GETATTRLIST)
CHECK_INCLUDE_FILE_D(libkern/OSAtomic.h HAVE_LIBKERN_OSATOMIC_H)
CHECK_FUNCTION_EXISTS_D(OSSpinLockLock HAVE_OSSPINLOCKLOCK)
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
