Revision: 41145
http://brlcad.svn.sourceforge.net/brlcad/?rev=41145&view=rev
Author: starseeker
Date: 2010-10-26 22:41:59 +0000 (Tue, 26 Oct 2010)
Log Message:
-----------
Still not building a working wish, but seeing some obvious problems now in how
headers are generated - have points on which to work.
Modified Paths:
--------------
brlcad/branches/cmake/src/other/tcl/CMakeLists.txt
brlcad/branches/cmake/src/other/tcl/generic/regex.h
brlcad/branches/cmake/src/other/tk/CMakeLists.txt
Modified: brlcad/branches/cmake/src/other/tcl/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tcl/CMakeLists.txt 2010-10-26 19:29:12 UTC
(rev 41144)
+++ brlcad/branches/cmake/src/other/tcl/CMakeLists.txt 2010-10-26 22:41:59 UTC
(rev 41145)
@@ -54,7 +54,7 @@
# version numbers
SET(TCL_MAJOR_VERSION 8)
SET(TCL_MINOR_VERSION 5)
-SET(TCL_PATCH_LEVEL 9)
+SET(TCL_PATCH_LEVEL 8)
SET(TCL_VERSION "${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}.${TCL_PATCH_LEVEL}")
@@ -532,6 +532,7 @@
add_library(tcl ${TCL_SRCS})
target_link_libraries(tcl ${COREFOUNDATION_FRAMEWORK} ${M_LIBRARY}
${DL_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
install(TARGETS tcl DESTINATION lib)
+SET_TARGET_PROPERTIES(tcl PROPERTIES VERSION ${TCL_VERSION} SOVERSION
${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION})
add_library(tclstub STATIC ${TCL_STUB_SRCS})
target_link_libraries(tclstub ${CMAKE_THREAD_LIBS_INIT}
${COREFOUNDATION_FRAMEWORK} ${M_LIBRARY} ${DL_LIBRARY})
Modified: brlcad/branches/cmake/src/other/tcl/generic/regex.h
===================================================================
--- brlcad/branches/cmake/src/other/tcl/generic/regex.h 2010-10-26 19:29:12 UTC
(rev 41144)
+++ brlcad/branches/cmake/src/other/tcl/generic/regex.h 2010-10-26 22:41:59 UTC
(rev 41145)
@@ -78,6 +78,7 @@
*/
/* --- begin --- */
+#undef __REG_NOCHAR
#define __REG_NOCHAR 1 /* don't define the char versions so we can avoid
conflicting type compilation errors */
/* --- end --- */
Modified: brlcad/branches/cmake/src/other/tk/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tk/CMakeLists.txt 2010-10-26 19:29:12 UTC
(rev 41144)
+++ brlcad/branches/cmake/src/other/tk/CMakeLists.txt 2010-10-26 22:41:59 UTC
(rev 41145)
@@ -278,60 +278,58 @@
generic/tkAtom.c
generic/tkBind.c
generic/tkBitmap.c
+ generic/tkButton.c
+ generic/tkCanvArc.c
+ generic/tkCanvBmap.c
+ generic/tkCanvImg.c
+ generic/tkCanvLine.c
+ generic/tkCanvPoly.c
+ generic/tkCanvPs.c
+ generic/tkCanvText.c
+ generic/tkCanvUtil.c
+ generic/tkCanvWind.c
+ generic/tkCanvas.c
generic/tkClipboard.c
generic/tkCmds.c
generic/tkColor.c
generic/tkConfig.c
+ generic/tkConsole.c
generic/tkCursor.c
+ generic/tkEntry.c
generic/tkError.c
generic/tkEvent.c
generic/tkFocus.c
generic/tkFont.c
- generic/tkGet.c
+ generic/tkFrame.c
generic/tkGC.c
generic/tkGeometry.c
+ generic/tkGet.c
generic/tkGrab.c
generic/tkGrid.c
- generic/tkConsole.c
- generic/tkMain.c
- generic/tkOption.c
- generic/tkPack.c
- generic/tkPlace.c
- generic/tkSelect.c
- generic/tkStyle.c
- generic/tkUndo.c
- generic/tkUtil.c
- generic/tkVisual.c
- generic/tkWindow.c
- generic/tkButton.c
- generic/tkObj.c
- generic/tkEntry.c
- generic/tkFrame.c
+ generic/tkImage.c
+ generic/tkImgBmap.c
+ generic/tkImgGIF.c
+ generic/tkImgPPM.c
+ generic/tkImgPhoto.c
generic/tkListbox.c
+ generic/tkMain.c
generic/tkMenu.c
- generic/tkMenubutton.c
generic/tkMenuDraw.c
+ generic/tkMenubutton.c
generic/tkMessage.c
+ generic/tkObj.c
+ generic/tkOldConfig.c
+ generic/tkOption.c
+ generic/tkPack.c
generic/tkPanedWindow.c
+ generic/tkPlace.c
+ generic/tkRectOval.c
generic/tkScale.c
generic/tkScrollbar.c
- generic/tkCanvas.c
- generic/tkCanvArc.c
- generic/tkCanvBmap.c
- generic/tkCanvImg.c
- generic/tkCanvLine.c
- generic/tkCanvPoly.c
- generic/tkCanvPs.c
- generic/tkCanvText.c
- generic/tkCanvUtil.c
- generic/tkCanvWind.c
- generic/tkRectOval.c
- generic/tkTrig.c
- generic/tkImage.c
- generic/tkImgBmap.c
- generic/tkImgGIF.c
- generic/tkImgPPM.c
- generic/tkImgPhoto.c
+ generic/tkSelect.c
+ generic/tkStubInit.c
+ generic/tkStubLib.c
+ generic/tkStyle.c
generic/tkText.c
generic/tkTextBTree.c
generic/tkTextDisp.c
@@ -340,12 +338,11 @@
generic/tkTextMark.c
generic/tkTextTag.c
generic/tkTextWind.c
- generic/tkOldConfig.c
- generic/tkOldTest.c
- generic/tkSquare.c
- generic/tkTest.c
- generic/tkStubInit.c
- generic/tkStubLib.c
+ generic/tkTrig.c
+ generic/tkUndo.c
+ generic/tkUtil.c
+ generic/tkVisual.c
+ generic/tkWindow.c
)
SET(TTK_SRCS
@@ -372,6 +369,8 @@
generic/ttk/ttkSeparator.c
generic/ttk/ttkSquare.c
generic/ttk/ttkState.c
+ generic/ttk/ttkStubInit.c
+ generic/ttk/ttkStubLib.c
generic/ttk/ttkTagSet.c
generic/ttk/ttkTheme.c
generic/ttk/ttkTrace.c
@@ -391,7 +390,6 @@
)
SET(TK_X11_SRCS
- unix/tkAppInit.c
unix/tkUnix.c
unix/tkUnix3d.c
unix/tkUnixButton.c
@@ -402,11 +400,11 @@
unix/tkUnixEmbed.c
unix/tkUnixEvent.c
unix/tkUnixFocus.c
- unix/tkUnixRFont.c
unix/tkUnixInit.c
unix/tkUnixKey.c
unix/tkUnixMenu.c
unix/tkUnixMenubu.c
+ unix/tkUnixRFont.c
unix/tkUnixScale.c
unix/tkUnixScrlbr.c
unix/tkUnixSelect.c
@@ -463,7 +461,7 @@
SET(TK_WIN_SRCS
)
-SET(TK_SRCS ${TK_GENERIC_SRCS} ${TTK_SRCS} ${TTK_STUB_SRCS})
+SET(TK_SRCS ${TK_GENERIC_SRCS} ${TTK_SRCS})
IF(WIN32)
SET(TK_SRCS ${TK_SRCS} ${TK_WIN_SRCS})
@@ -528,6 +526,7 @@
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})
install(TARGETS tk DESTINATION lib)
+SET_TARGET_PROPERTIES(tk PROPERTIES VERSION ${TK_VERSION} SOVERSION
${TK_MAJOR_VERSION}.${TK_MINOR_VERSION})
add_library(tkstub STATIC ${TK_STUB_SRCS})
install(TARGETS tkstub DESTINATION lib)
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
