Revision: 41235
http://brlcad.svn.sourceforge.net/brlcad/?rev=41235&view=rev
Author: starseeker
Date: 2010-11-02 19:46:24 +0000 (Tue, 02 Nov 2010)
Log Message:
-----------
Add some more stuff, replace a couple accidentally deleted files - showing
signs of getting closer to being a functional Tk build, although Tcl vs. Tk
CFLAGS still need straightening out and the plist logic for Tk is not yet
present.
Modified Paths:
--------------
brlcad/branches/cmake/src/other/tk/CMakeLists.txt
Modified: brlcad/branches/cmake/src/other/tk/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tk/CMakeLists.txt 2010-11-02 19:10:44 UTC
(rev 41234)
+++ brlcad/branches/cmake/src/other/tk/CMakeLists.txt 2010-11-02 19:46:24 UTC
(rev 41235)
@@ -45,6 +45,9 @@
# set CMake project name
PROJECT(TK)
+# set local CFLAGS name
+SET(CFLAGS_NAME TK)
+
# build shared libs by default
OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON)
@@ -110,7 +113,7 @@
SET(TCL_CFLAGS "${TCL_CFLAGS} -DSTDC_HEADERS=1")
IF(APPLE)
- FILE(APPEND ${CONFIG_H_FILE} "#define MAC_OSX_TCL 1\n")
+ SET(TCL_CFLAGS "${TCL_CFLAGS} -DMAC_OSX_TCL=1")
ENDIF(APPLE)
#----------------------------------------------------------------------------
@@ -138,7 +141,30 @@
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)
+IF(NOT HAVE_SYS_FSTATFS_H)
+ SET(TCL_CFLAGS "${TCL_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)
+CHECK_INCLUDE_FILE_D(inttypes.h HAVE_INTTYPES_H)
+CHECK_INCLUDE_FILE_D(stdint.h HAVE_STDINT_H)
+CHECK_INCLUDE_FILE_D(unistd.h HAVE_UNISTD_H)
+
+IF(APPLE)
+ find_library(COREFOUNDATION_FRAMEWORK CoreFoundation)
+ IF(COREFOUNDATION_FRAMEWORK)
+ FILE(APPEND ${CONFIG_H_FILE} "#define HAVE_COREFOUNDATION 1\n")
+ ENDIF(COREFOUNDATION_FRAMEWORK)
+ find_library(FONTCONFIG_LIBRARY fontconfig)
+ENDIF(APPLE)
+
find_package(X11)
+find_package(Freetype)
+
SET(TK_WINDOWINGSYSTEM X11)
IF(${CMAKE_SYSTEM_NAME} MATCHES "^Darwin$")
@@ -434,22 +460,23 @@
ENDIF(APPLE)
ENDIF(WIN32)
-include_directories(
- ${TCL_INCLUDE_PATH}
- ${TK_INCLUDE_PATH}
- ${FREETYPE_INCLUDE_DIRS}
-)
-
IF(WIN32)
SET(WISH_SRCS win/tkAppInit.c)
ELSE(WIN32)
SET(WISH_SRCS unix/tkAppInit.c)
ENDIF(WIN32)
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TCL_CFLAGS}")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TCL_CFLAGS} ${TK_CFLAGS}")
+include_directories(
+ ${TCL_INCLUDE_PATH}
+ ${TK_INCLUDE_PATH}
+ ${X11_INCLUDE_DIR}
+ ${FREETYPE_INCLUDE_DIRS}
+)
+
add_library(tk ${TK_SRCS})
-target_link_libraries(tk tclstub ${COREFOUNDATION_FRAMEWORK} ${X11_X11_LIB}
${X11_Xscreensaver_LIB} ${X11_Xext_LIB} ${X11_Xft_LIB} ${FREETYPE_LIBRARIES}
${FONTCONFIG_LIBRARY} ${X11_Xrender_LIB})
+target_link_libraries(tk tcl ${COREFOUNDATION_FRAMEWORK} ${X11_X11_LIB}
${X11_Xscreensaver_LIB} ${X11_Xext_LIB} ${X11_Xft_LIB} ${FREETYPE_LIBRARIES}
${FONTCONFIG_LIBRARY} ${X11_Xrender_LIB})
install(TARGETS tk DESTINATION lib)
SET_TARGET_PROPERTIES(tk PROPERTIES VERSION ${TK_VERSION} SOVERSION
${TK_MAJOR_VERSION}.${TK_MINOR_VERSION})
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
