Revision: 41236
http://brlcad.svn.sourceforge.net/brlcad/?rev=41236&view=rev
Author: starseeker
Date: 2010-11-02 21:59:38 +0000 (Tue, 02 Nov 2010)
Log Message:
-----------
Switch TCL_CFLAGS to TK_CFLAGS to avoid conflicts - need to make this more
generic in some fashion later.
Modified Paths:
--------------
brlcad/branches/cmake/src/other/tk/CMake/tcl.cmake
brlcad/branches/cmake/src/other/tk/CMakeLists.txt
Modified: brlcad/branches/cmake/src/other/tk/CMake/tcl.cmake
===================================================================
--- brlcad/branches/cmake/src/other/tk/CMake/tcl.cmake 2010-11-02 19:46:24 UTC
(rev 41235)
+++ brlcad/branches/cmake/src/other/tk/CMake/tcl.cmake 2010-11-02 21:59:38 UTC
(rev 41236)
@@ -17,9 +17,9 @@
INCLUDE(ac_std_funcs)
-MACRO(ADD_TCL_CFLAG TCL_CFLAG)
- SET(TCL_CFLAGS "${TCL_CFLAGS} -D${TCL_CFLAG}=1" CACHE STRING "TCL
CFLAGS" FORCE)
-ENDMACRO(ADD_TCL_CFLAG)
+MACRO(ADD_TK_CFLAG TK_CFLAG)
+ SET(TK_CFLAGS "${TK_CFLAGS} -D${TK_CFLAG}=1" CACHE STRING "TCL CFLAGS"
FORCE)
+ENDMACRO(ADD_TK_CFLAG)
# Note - for these path and load functions, should move the FindTCL.cmake
# logic that applies to here
@@ -80,29 +80,29 @@
MACRO(SC_ENABLE_THREADS)
OPTION(TCL_THREADS "Enable Tcl Thread support" ON)
IF(TCL_THREADS)
- ADD_TCL_CFLAG(TCL_THREADS)
- ADD_TCL_CFLAG(USE_THREAD_ALLOC)
- ADD_TCL_CFLAG(_REENTRANT)
- ADD_TCL_CFLAG(_THREAD_SAFE)
+ ADD_TK_CFLAG(TCL_THREADS)
+ ADD_TK_CFLAG(USE_THREAD_ALLOC)
+ ADD_TK_CFLAG(_REENTRANT)
+ ADD_TK_CFLAG(_THREAD_SAFE)
IF(${CMAKE_SYSTEM_NAME} MATCHES "^SunOS$")
- ADD_TCL_CFLAG(_POSIX_PTHREAD_SEMANTICS)
+ ADD_TK_CFLAG(_POSIX_PTHREAD_SEMANTICS)
ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "^SunOS$")
FIND_PACKAGE(Threads)
CHECK_FUNCTION_EXISTS(pthread_attr_setstacksize
HAVE_PTHREAD_ATTR_SETSTACKSIZE)
IF(HAVE_PTHREAD_ATTR_SETSTACKSIZE)
- ADD_TCL_CFLAG(HAVE_PTHREAD_ATTR_SETSTACKSIZE)
+ ADD_TK_CFLAG(HAVE_PTHREAD_ATTR_SETSTACKSIZE)
ENDIF(HAVE_PTHREAD_ATTR_SETSTACKSIZE)
CHECK_FUNCTION_EXISTS(pthread_attr_get_np
HAVE_PTHREAD_ATTR_GET_NP)
CHECK_FUNCTION_EXISTS(pthread_getattr_np
HAVE_PTHREAD_GETATTR_NP)
IF(HAVE_PTHREAD_ATTR_GET_NP)
- ADD_TCL_CFLAG(HAVE_PTHREAD_ATTR_GET_NP)
+ ADD_TK_CFLAG(HAVE_PTHREAD_ATTR_GET_NP)
ELSEIF(HAVE_PTHREAD_GETATTR_NP)
- ADD_TCL_CFLAG(HAVE_PTHREAD_GETATTR_NP)
+ ADD_TK_CFLAG(HAVE_PTHREAD_GETATTR_NP)
ENDIF(HAVE_PTHREAD_ATTR_GET_NP)
IF(NOT HAVE_PTHREAD_ATTR_GET_NP AND NOT HAVE_PTHREAD_GETATTR_NP)
CHECK_FUNCTION_EXISTS(pthread_get_stacksize_np
HAVE_PTHREAD_GET_STACKSIZE_NP)
IF(HAVE_PTHREAD_GET_STACKSIZE_NP)
- ADD_TCL_CFLAG(HAVE_PTHREAD_GET_STACKSIZE_NP)
+ ADD_TK_CFLAG(HAVE_PTHREAD_GET_STACKSIZE_NP)
ENDIF(HAVE_PTHREAD_GET_STACKSIZE_NP)
ENDIF(NOT HAVE_PTHREAD_ATTR_GET_NP AND NOT
HAVE_PTHREAD_GETATTR_NP)
ENDIF(TCL_THREADS)
@@ -130,7 +130,7 @@
")
CHECK_C_SOURCE_COMPILES("${LANGINFO_SRC}"
LANGINFO_COMPILES)
IF(LANGINFO_COMPILES)
- ADD_TCL_CFLAG(HAVE_LANGINFO)
+ ADD_TK_CFLAG(HAVE_LANGINFO)
ELSE(LANGINFO_COMPILES)
SET(ENABLE_LANGINFO OFF CACHE STRING "Langinfo
off" FORCE)
ENDIF(LANGINFO_COMPILES)
@@ -261,13 +261,13 @@
ENDIF(NOT HAVE_TERMIO AND NOT HAVE_TERMIOS AND NOT HAVE_SGTTY)
IF(HAVE_TERMIOS)
- ADD_TCL_CFLAG(USE_TERMIOS)
+ ADD_TK_CFLAG(USE_TERMIOS)
ELSE(HAVE_TERMIOS)
IF(HAVE_TERMIO)
- ADD_TCL_CFLAG(USE_TERMIO)
+ ADD_TK_CFLAG(USE_TERMIO)
ELSE(HAVE_TERMIO)
IF(HAVE_SGTTY)
- ADD_TCL_CFLAG(USE_SGTTY)
+ ADD_TK_CFLAG(USE_SGTTY)
ENDIF(HAVE_SGTTY)
ENDIF(HAVE_TERMIO)
ENDIF(HAVE_TERMIOS)
@@ -280,7 +280,7 @@
MACRO(SC_MISSING_POSIX_HEADERS)
CHECK_INCLUDE_FILE_D(dirent.h HAVE_DIRENT_H)
IF(NOT HAVE_DIRENT_H)
- SET(TCL_CFLAGS "${TCL_CFLAGS} -DNO_DIRENT_H=1")
+ SET(TK_CFLAGS "${TK_CFLAGS} -DNO_DIRENT_H=1")
ENDIF(NOT HAVE_DIRENT_H)
CHECK_INCLUDE_FILE_USABILITY_D(float.h FLOAT_H)
CHECK_INCLUDE_FILE_USABILITY_D(values.h VALUES_H)
@@ -288,7 +288,7 @@
CHECK_INCLUDE_FILE_D(stdlib.h HAVE_STDLIB_H)
CHECK_INCLUDE_FILE_D(string.h HAVE_STRING_H)
IF(NOT HAVE_STRING_H)
- SET(TCL_CFLAGS "${TCL_CFLAGS} -DNO_STRING_H=1")
+ SET(TK_CFLAGS "${TK_CFLAGS} -DNO_STRING_H=1")
ENDIF(NOT HAVE_STRING_H)
CHECK_INCLUDE_FILE_USABILITY_D(sys/wait.h SYS_WAIT_H)
CHECK_INCLUDE_FILE_USABILITY_D(dlfcn.h DLFCN_H)
@@ -308,12 +308,12 @@
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)
+ ADD_TK_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)
+ ADD_TK_CFLAG(USE_FIONBIO)
ENDIF (${CMAKE_SYSTEM_MAJOR_VERSION} LESS 5)
ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "^SunOS$")
@@ -330,7 +330,7 @@
CHECK_INCLUDE_FILE_USABILITY_D(sys/time.h SYS_TIME_H)
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)
+ ADD_TK_CFLAG(HAVE_TM_ZONE)
ELSE(HAVE_STRUCT_TM_TM_ZONE)
SET(TZNAME_SRC "
#include <time.h>
@@ -342,7 +342,7 @@
}")
CHECK_C_SOURCE_COMPILES("${TZNAME_SRC}" HAVE_TZNAME)
IF(HAVE_TZNAME)
- ADD_TCL_CFLAG(HAVE_DECL_TZNAME)
+ ADD_TK_CFLAG(HAVE_DECL_TZNAME)
ENDIF(HAVE_TZNAME)
ENDIF(HAVE_STRUCT_TM_TM_ZONE)
CHECK_FUNCTION_EXISTS_D(gmtime_r HAVE_GMTIME_R)
@@ -361,7 +361,7 @@
")
CHECK_C_SOURCE_COMPILES("${TZONE_SRC_1}" HAVE_TIMEZONE_VAR)
IF(HAVE_TIMEZONE_VAR)
- ADD_TCL_CFLAG(HAVE_TIMEZONE_VAR)
+ ADD_TK_CFLAG(HAVE_TIMEZONE_VAR)
ELSE(HAVE_TIMEZONE_VAR)
SET(TZONE_SRC_2 "
#include <time.h>
@@ -374,7 +374,7 @@
")
CHECK_C_SOURCE_COMPILES("${TZONE_SRC_2}" HAVE_TIMEZONE_VAR)
IF(HAVE_TIMEZONE_VAR)
- ADD_TCL_CFLAG(HAVE_TIMEZONE_VAR)
+ ADD_TK_CFLAG(HAVE_TIMEZONE_VAR)
ENDIF(HAVE_TIMEZONE_VAR)
ENDIF(HAVE_TIMEZONE_VAR)
ENDMACRO(SC_TIME_HANDLER)
@@ -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(TK_CFLAGS "${TK_CFLAGS}
-DTCL_CFGVAL_ENCODING=\\\"${TCL_CFGVAL_ENCODING}\\\"" CACHE STRING "TCL CFLAGS"
FORCE)
ENDMACRO(SC_TCL_CFG_ENCODING)
@@ -517,7 +517,7 @@
")
CHECK_C_SOURCE_COMPILES("${HAVE_GETHOSTBYADDR_R_7_SRC}"
HAVE_GETHOSTBYADDR_R_7)
IF(HAVE_GETHOSTBYADDR_R_7)
- ADD_TCL_CFLAG(HAVE_GETHOSTBYADDR_R_7)
+ ADD_TK_CFLAG(HAVE_GETHOSTBYADDR_R_7)
ELSE(HAVE_GETHOSTBYADDR_R_7)
SET(HAVE_GETHOSTBYADDR_R_8_SRC "
#include <netdb.h>
@@ -535,7 +535,7 @@
")
CHECK_C_SOURCE_COMPILES("${HAVE_GETHOSTBYADDR_R_8_SRC}"
HAVE_GETHOSTBYADDR_R_8)
IF(HAVE_GETHOSTBYADDR_R_8)
- ADD_TCL_CFLAG(HAVE_GETHOSTBYADDR_R_8)
+ ADD_TK_CFLAG(HAVE_GETHOSTBYADDR_R_8)
ENDIF(HAVE_GETHOSTBYADDR_R_8)
ENDIF(HAVE_GETHOSTBYADDR_R_7)
ENDIF(HAVE_GETHOSTBYADDR_R)
@@ -561,7 +561,7 @@
")
CHECK_C_SOURCE_COMPILES("${HAVE_GETHOSTBYNAME_R_6_SRC}"
HAVE_GETHOSTBYNAME_R_5)
IF(HAVE_GETHOSTBYNAME_R_6)
- ADD_TCL_CFLAG(HAVE_GETHOSTBYNAME_R_6)
+ ADD_TK_CFLAG(HAVE_GETHOSTBYNAME_R_6)
ELSE(HAVE_GETHOSTBYNAME_R_6)
SET(HAVE_GETHOSTBYNAME_R_5_SRC "
#include <netdb.h>
@@ -578,7 +578,7 @@
CHECK_C_SOURCE_COMPILES("${HAVE_GETHOSTBYNAME_R_5_SRC}"
HAVE_GETHOSTBYNAME_R_5)
IF(HAVE_GETHOSTBYNAME_R_5)
- ADD_TCL_CFLAG(HAVE_GETHOSTBYNAME_R_5)
+ ADD_TK_CFLAG(HAVE_GETHOSTBYNAME_R_5)
ELSE(HAVE_GETHOSTBYNAME_R_5)
SET(HAVE_GETHOSTBYNAME_R_3_SRC "
#include <netdb.h>
@@ -592,7 +592,7 @@
")
CHECK_C_SOURCE_COMPILES("${HAVE_GETHOSTBYNAME_R_3_SRC}" HAVE_GETHOSTBYNAME_R_3)
IF(HAVE_GETHOSTBYNAME_R_3)
- ADD_TCL_CFLAG(HAVE_GETHOSTBYNAME_R_3)
+ ADD_TK_CFLAG(HAVE_GETHOSTBYNAME_R_3)
ENDIF(HAVE_GETHOSTBYNAME_R_3)
ENDIF(HAVE_GETHOSTBYNAME_R_5)
ENDIF(HAVE_GETHOSTBYNAME_R_6)
@@ -617,7 +617,7 @@
")
CHECK_C_SOURCE_COMPILES("${GETADDRINFO_SRC}"
WORKING_GETADDRINFO)
IF(WORKING_GETADDRINFO)
- ADD_TCL_CFLAG(HAVE_GETADDRINFO)
+ ADD_TK_CFLAG(HAVE_GETADDRINFO)
ENDIF(WORKING_GETADDRINFO)
ENDIF(HAVE_GETADDRINFO)
ENDMACRO(SC_TCL_GETADDRINFO)
@@ -642,7 +642,7 @@
")
CHECK_C_SOURCE_COMPILES("${HAVE_GETPWUID_R_5_SRC}"
HAVE_GETPWUID_R_5)
IF(HAVE_GETPWUID_R_5)
- ADD_TCL_CFLAG(HAVE_GETPWUID_R_5)
+ ADD_TK_CFLAG(HAVE_GETPWUID_R_5)
ELSE(HAVE_GETPWUID_R_5)
SET(HAVE_GETPWUID_R_4_SRC "
#include <sys/types.h>
@@ -658,7 +658,7 @@
")
CHECK_C_SOURCE_COMPILES("${HAVE_GETPWUID_R_4_SRC}"
HAVE_GETPWUID_R_4)
IF(HAVE_GETPWUID_R_4)
- ADD_TCL_CFLAG(HAVE_GETPWUID_R_4)
+ ADD_TK_CFLAG(HAVE_GETPWUID_R_4)
ENDIF(HAVE_GETPWUID_R_4)
ENDIF(HAVE_GETPWUID_R_5)
ENDIF(HAVE_GETPWUID_R)
@@ -684,7 +684,7 @@
")
CHECK_C_SOURCE_COMPILES("${HAVE_GETPWNAM_R_5_SRC}"
HAVE_GETPWNAM_R_5)
IF(HAVE_GETPWNAM_R_5)
- ADD_TCL_CFLAG(HAVE_GETPWNAM_R_5)
+ ADD_TK_CFLAG(HAVE_GETPWNAM_R_5)
ELSE(HAVE_GETPWNAM_R_5)
SET(HAVE_GETPWNAM_R_4_SRC "
#include <sys/types.h>
@@ -700,7 +700,7 @@
")
CHECK_C_SOURCE_COMPILES("${HAVE_GETPWNAM_R_4_SRC}"
HAVE_GETPWNAM_R_4)
IF(HAVE_GETPWNAM_R_4)
- ADD_TCL_CFLAG(HAVE_GETPWNAM_R_4)
+ ADD_TK_CFLAG(HAVE_GETPWNAM_R_4)
ENDIF(HAVE_GETPWNAM_R_4)
ENDIF(HAVE_GETPWNAM_R_5)
ENDIF(HAVE_GETPWNAM_R)
@@ -726,7 +726,7 @@
")
CHECK_C_SOURCE_COMPILES("${HAVE_GETGRGID_R_5_SRC}"
HAVE_GETGRGID_R_5)
IF(HAVE_GETGRGID_R_5)
- ADD_TCL_CFLAG(HAVE_GETGRGID_R_5)
+ ADD_TK_CFLAG(HAVE_GETGRGID_R_5)
ELSE(HAVE_GETGRGID_R_5)
SET(HAVE_GETGRGID_R_4_SRC "
#include <sys/types.h>
@@ -742,7 +742,7 @@
")
CHECK_C_SOURCE_COMPILES("${HAVE_GETGRGID_R_4_SRC}"
HAVE_GETGRGID_R_4)
IF(HAVE_GETGRGID_R_4)
- ADD_TCL_CFLAG(HAVE_GETGRGID_R_4)
+ ADD_TK_CFLAG(HAVE_GETGRGID_R_4)
ENDIF(HAVE_GETGRGID_R_4)
ENDIF(HAVE_GETGRGID_R_5)
ENDIF(HAVE_GETGRGID_R)
@@ -768,7 +768,7 @@
")
CHECK_C_SOURCE_COMPILES("${HAVE_GETGRNAM_R_5_SRC}"
HAVE_GETGRNAM_R_5)
IF(HAVE_GETGRNAM_R_5)
- ADD_TCL_CFLAG(HAVE_GETGRNAM_R_5)
+ ADD_TK_CFLAG(HAVE_GETGRNAM_R_5)
ELSE(HAVE_GETGRNAM_R_5)
SET(HAVE_GETGRNAM_R_4_SRC "
#include <sys/types.h>
@@ -784,7 +784,7 @@
")
CHECK_C_SOURCE_COMPILES("${HAVE_GETGRNAM_R_4_SRC}"
HAVE_GETGRNAM_R_4)
IF(HAVE_GETGRNAM_R_4)
- ADD_TCL_CFLAG(HAVE_GETGRNAM_R_4)
+ ADD_TK_CFLAG(HAVE_GETGRNAM_R_4)
ENDIF(HAVE_GETGRNAM_R_4)
ENDIF(HAVE_GETGRNAM_R_5)
ENDIF(HAVE_GETGRNAM_R)
Modified: brlcad/branches/cmake/src/other/tk/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tk/CMakeLists.txt 2010-11-02 19:46:24 UTC
(rev 41235)
+++ brlcad/branches/cmake/src/other/tk/CMakeLists.txt 2010-11-02 21:59:38 UTC
(rev 41236)
@@ -105,15 +105,15 @@
#----------------------------------------------------------------------------
# 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=\\\"tk\\\"")
-SET(TCL_CFLAGS "${TCL_CFLAGS} -DPACKAGE_TARNAME=\\\"tk\\\"")
-SET(TCL_CFLAGS "${TCL_CFLAGS}
-DPACKAGE_VERSION=\\\"${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}\\\"")
-SET(TCL_CFLAGS "${TCL_CFLAGS} -DPACKAGE_STRING=\\\"tk\\
${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}\\\"")
-SET(TCL_CFLAGS "${TCL_CFLAGS} -DPACKAGE_BUGREPORT=\\\"\\\"")
-SET(TCL_CFLAGS "${TCL_CFLAGS} -DSTDC_HEADERS=1")
+SET(TK_CFLAGS "${TK_CFLAGS} -DPACKAGE_NAME=\\\"tk\\\"")
+SET(TK_CFLAGS "${TK_CFLAGS} -DPACKAGE_TARNAME=\\\"tk\\\"")
+SET(TK_CFLAGS "${TK_CFLAGS}
-DPACKAGE_VERSION=\\\"${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}\\\"")
+SET(TK_CFLAGS "${TK_CFLAGS} -DPACKAGE_STRING=\\\"tk\\
${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}\\\"")
+SET(TK_CFLAGS "${TK_CFLAGS} -DPACKAGE_BUGREPORT=\\\"\\\"")
+SET(TK_CFLAGS "${TK_CFLAGS} -DSTDC_HEADERS=1")
IF(APPLE)
- SET(TCL_CFLAGS "${TCL_CFLAGS} -DMAC_OSX_TCL=1")
+ SET(TK_CFLAGS "${TK_CFLAGS} -DMAC_OSX_TCL=1")
ENDIF(APPLE)
#----------------------------------------------------------------------------
@@ -126,7 +126,7 @@
INCLUDE(TestBigEndian)
TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
IF(WORDS_BIGENDIAN)
- SET(TCL_CFLAGS "${TCL_CFLAGS} -DWORDS_BIGENDIAN=1")
+ SET(TK_CFLAGS "${TK_CFLAGS} -DWORDS_BIGENDIAN=1")
ENDIF(WORDS_BIGENDIAN)
SC_TIME_HANDLER()
@@ -146,7 +146,7 @@
CHECK_INCLUDE_FILE_D(sys/stat.h HAVE_SYS_STAT_H)
CHECK_INCLUDE_FILE_D(sys/fstatfs.h HAVE_SYS_FSTATFS_H)
IF(NOT HAVE_SYS_FSTATFS_H)
- SET(TCL_CFLAGS "${TCL_CFLAGS} -DNO_FSTATFS=1")
+ SET(TK_CFLAGS "${TK_CFLAGS} -DNO_FSTATFS=1")
ENDIF(NOT HAVE_SYS_FSTATFS_H)
CHECK_INCLUDE_FILE_D(memory.h HAVE_MEMORY_H)
CHECK_INCLUDE_FILE_D(strings.h HAVE_STRINGS_H)
@@ -176,10 +176,10 @@
CHECK_FUNCTION_EXISTS_D(OSSpinLockLock HAVE_OSSPINLOCKLOCK)
CHECK_FUNCTION_EXISTS_D(pthread_atfork HAVE_PTHREAD_ATFORK)
ENDIF(${COREFOUNDATION_FRAMEWORK})
- ADD_TCL_CFLAG(USE_VFORK)
- SET(TCL_CFLAGS "${TCL_CFLAGS} -DTCL_DEFAULT_ENCODING=\\\"utf-8\\\"")
- ADD_TCL_CFLAG(TCL_LOAD_FROM_MEMORY)
- ADD_TCL_CFLAG(TCL_WIDE_CLICKS)
+ ADD_TK_CFLAG(USE_VFORK)
+ SET(TK_CFLAGS "${TK_CFLAGS} -DTCL_DEFAULT_ENCODING=\\\"utf-8\\\"")
+ ADD_TK_CFLAG(TCL_LOAD_FROM_MEMORY)
+ ADD_TK_CFLAG(TCL_WIDE_CLICKS)
CHECK_INCLUDE_FILE_USABILITY_D(AvailabilityMacros.h
HAVE_AVAILABILITYMACROS_H)
IF(HAVE_AVAILABILITYMACROS_H)
SET(WEAK_IMPORT_SRCS "
@@ -198,7 +198,7 @@
")
CHECK_C_SOURCE_COMPILES("${WEAK_IMPORT_SRCS}"
WEAK_IMPORT_WORKING)
IF(WEAK_IMPORT_WORKING)
- ADD_TCL_CFLAG(HAVE_WEAK_IMPORT)
+ ADD_TK_CFLAG(HAVE_WEAK_IMPORT)
ENDIF(WEAK_IMPORT_WORKING)
SET(SUSV3_SRCS "
#ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
@@ -215,7 +215,7 @@
")
CHECK_C_SOURCE_COMPILES("${SUSV3_SRCS}" SUSV3_WORKING)
IF(SUSV3_WORKING)
- ADD_TCL_CFLAG(_DARWIN_C_SOURCE)
+ ADD_TK_CFLAG(_DARWIN_C_SOURCE)
ENDIF(SUSV3_WORKING)
ENDIF(HAVE_AVAILABILITYMACROS_H)
@@ -466,7 +466,7 @@
SET(WISH_SRCS unix/tkAppInit.c)
ENDIF(WIN32)
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TCL_CFLAGS} ${TK_CFLAGS}")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TK_CFLAGS}")
include_directories(
${TCL_INCLUDE_PATH}
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
