[brlcad-commits] SF.net SVN: brlcad:[41686] brlcad/trunk/src/libbu/CMakeLists.txt
Revision: 41686 http://brlcad.svn.sourceforge.net/brlcad/?rev=41686view=rev Author: d_rossberg Date: 2010-12-17 12:31:14 + (Fri, 17 Dec 2010) Log Message: --- synced with Makefile.am (booleanize.c) Modified Paths: -- brlcad/trunk/src/libbu/CMakeLists.txt Modified: brlcad/trunk/src/libbu/CMakeLists.txt === --- brlcad/trunk/src/libbu/CMakeLists.txt 2010-12-17 00:24:26 UTC (rev 41685) +++ brlcad/trunk/src/libbu/CMakeLists.txt 2010-12-17 12:31:14 UTC (rev 41686) @@ -6,6 +6,7 @@ basename.c bitv.c bomb.c +booleanize.c brlcad_path.c cmd.c cmdhist.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Lotusphere 2011 Register now for Lotusphere 2011 and learn how to connect the dots, take your collaborative environment to the next level, and enter the era of Social Business. http://p.sf.net/sfu/lotusphere-d2d ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[41687] brlcad/branches/cmake/src/libbu/CMakeLists.txt
Revision: 41687 http://brlcad.svn.sourceforge.net/brlcad/?rev=41687view=rev Author: starseeker Date: 2010-12-17 13:09:02 + (Fri, 17 Dec 2010) Log Message: --- Sync cmake branch libbu as well. Modified Paths: -- brlcad/branches/cmake/src/libbu/CMakeLists.txt Modified: brlcad/branches/cmake/src/libbu/CMakeLists.txt === --- brlcad/branches/cmake/src/libbu/CMakeLists.txt 2010-12-17 12:31:14 UTC (rev 41686) +++ brlcad/branches/cmake/src/libbu/CMakeLists.txt 2010-12-17 13:09:02 UTC (rev 41687) @@ -12,6 +12,7 @@ basename.c bitv.c bomb.c +booleanize.c brlcad_path.c cmd.c cmdhist.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Lotusphere 2011 Register now for Lotusphere 2011 and learn how to connect the dots, take your collaborative environment to the next level, and enter the era of Social Business. http://p.sf.net/sfu/lotusphere-d2d ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[41688] brlcad/branches/cmake
Revision: 41688
http://brlcad.svn.sourceforge.net/brlcad/?rev=41688view=rev
Author: starseeker
Date: 2010-12-17 13:23:00 + (Fri, 17 Dec 2010)
Log Message:
---
Update cmake branch to trunk r41687
Modified Paths:
--
brlcad/branches/cmake/include/opennurbs_ext.h
brlcad/branches/cmake/misc/win32-msvc8/tclsh/library/installTree.tcl
brlcad/branches/cmake/src/libbn/bntester.c
brlcad/branches/cmake/src/libbn/bntester.dat
brlcad/branches/cmake/src/libbu/vls.c
brlcad/branches/cmake/src/librt/opennurbs_ext.cpp
brlcad/branches/cmake/src/mged/tedit.c
brlcad/branches/cmake/src/other/openNURBS/opennurbs_revsurface.cpp
brlcad/branches/cmake/src/other/tcl/generic/tclPlatDecls.h
Property Changed:
brlcad/branches/cmake/
brlcad/branches/cmake/src/other/tkhtml/
Property changes on: brlcad/branches/cmake
___
Modified: svn:mergeinfo
- /brlcad/trunk:37932-39894
+ /brlcad/trunk:37932-39894,41673-41687
Modified: brlcad/branches/cmake/include/opennurbs_ext.h
===
--- brlcad/branches/cmake/include/opennurbs_ext.h 2010-12-17 13:09:02 UTC
(rev 41687)
+++ brlcad/branches/cmake/include/opennurbs_ext.h 2010-12-17 13:23:00 UTC
(rev 41688)
@@ -77,7 +77,8 @@
#define BREP_MAX_LN_DEPTH 20
#define SIGN(x) ((x) = 0 ? 1 : -1)
/* Surface flatness parameter, Abert says between 0.8-0.9 */
-#define BREP_SURFACE_FLATNESS 0.8
+#define BREP_SURFACE_FLATNESS 0.85
+#define BREP_SURFACE_STRAIGHTNESS 0.75
/* Max newton iterations when finding closest point */
#define BREP_MAX_FCP_ITERATIONS 50
/* Root finding epsilon */
@@ -1425,6 +1426,7 @@
private:
bool isFlat(const ON_Surface* surf, ON_Plane frames[], ON_3dVector
normals[], ON_3dPoint corners[], const ON_Interval u, const ON_Interval v);
+bool isStraight(const ON_Surface* surf, ON_Plane frames[], ON_3dVector
normals[], ON_3dPoint corners[], const ON_Interval u, const ON_Interval v);
fastf_t isFlatU(const ON_Surface* surf, ON_Plane frames[], ON_3dVector
normals[], ON_3dPoint corners[], const ON_Interval u, const ON_Interval v);
fastf_t isFlatV(const ON_Surface* surf, ON_Plane frames[], ON_3dVector
normals[], ON_3dPoint corners[], const ON_Interval u, const ON_Interval v);
BBNode* subdivideSurfaceByKnots(const ON_Surface *localsurf, const
ON_Interval u, const ON_Interval v, ON_Plane frames[], ON_3dPoint corners[],
ON_3dVector normals[], int depth, int depthLimit);
Modified: brlcad/branches/cmake/misc/win32-msvc8/tclsh/library/installTree.tcl
===
--- brlcad/branches/cmake/misc/win32-msvc8/tclsh/library/installTree.tcl
2010-12-17 13:09:02 UTC (rev 41687)
+++ brlcad/branches/cmake/misc/win32-msvc8/tclsh/library/installTree.tcl
2010-12-17 13:23:00 UTC (rev 41688)
@@ -305,11 +305,21 @@
puts \[12 of 15] COPYING REDIST FILES
catch {
if {[info exists C:/Program Files/Microsoft Visual Studio
8/VC/redist/x86/Microsoft.VC80.CRT]} {
- copy_stuff C:/Program Files/Microsoft Visual Studio
8/VC/redist/x86/Microsoft.VC80.CRT [file join $installDir bin]
- copy_stuff C:/Program Files/Microsoft Visual Studio
8/VC/redist/x86/Microsoft.VC80.MFC [file join $installDir bin]
+ if {$platform == x64} {
+ copy_stuff C:/Program Files/Microsoft Visual Studio
8/VC/redist/amd64/Microsoft.VC80.CRT [file join $installDir bin]
+ copy_stuff C:/Program Files/Microsoft Visual Studio
8/VC/redist/amd64/Microsoft.VC80.MFC [file join $installDir bin]
+ } else {
+ copy_stuff C:/Program Files/Microsoft Visual Studio
8/VC/redist/x86/Microsoft.VC80.CRT [file join $installDir bin]
+ copy_stuff C:/Program Files/Microsoft Visual Studio
8/VC/redist/x86/Microsoft.VC80.MFC [file join $installDir bin]
+ }
} else {
- copy_stuff C:/Program Files (x86)/Microsoft Visual Studio
8/VC/redist/x86/Microsoft.VC80.CRT [file join $installDir bin]
- copy_stuff C:/Program Files (x86)/Microsoft Visual Studio
8/VC/redist/x86/Microsoft.VC80.MFC [file join $installDir bin]
+ if {$platform == x64} {
+ copy_stuff C:/Program Files (x86)/Microsoft Visual Studio
8/VC/redist/amd64/Microsoft.VC80.CRT [file join $installDir bin]
+ copy_stuff C:/Program Files (x86)/Microsoft Visual Studio
8/VC/redist/amd64/Microsoft.VC80.MFC [file join $installDir bin]
+ } else {
+ copy_stuff C:/Program Files (x86)/Microsoft Visual Studio
8/VC/redist/x86/Microsoft.VC80.CRT [file join $installDir bin]
+ copy_stuff C:/Program Files (x86)/Microsoft Visual Studio
8/VC/redist/x86/Microsoft.VC80.MFC [file join $installDir bin]
+ }
}
}
Modified: brlcad/branches/cmake/src/libbn/bntester.c
===
---
[brlcad-commits] SF.net SVN: brlcad:[41689] brlcad/branches/cmake/src/other/tcl
Revision: 41689
http://brlcad.svn.sourceforge.net/brlcad/?rev=41689view=rev
Author: starseeker
Date: 2010-12-17 19:00:32 + (Fri, 17 Dec 2010)
Log Message:
---
Inch closer to Tcl build on Windows - still having problems.
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-12-17 13:23:00 UTC
(rev 41688)
+++ brlcad/branches/cmake/src/other/tcl/CMake/tcl.cmake 2010-12-17 19:00:32 UTC
(rev 41689)
@@ -471,7 +471,11 @@
#
MACRO(SC_TCL_CFG_ENCODING)
IF(NOT TCL_CFGVAL_ENCODING)
- SET(TCL_CFGVAL_ENCODING iso8859-1)
+ IF(WIN32)
+ SET(TCL_CFGVAL_ENCODING cp1252)
+ ELSE(WIN32)
+ SET(TCL_CFGVAL_ENCODING iso8859-1)
+ ENDIF(WIN32)
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)
Modified: brlcad/branches/cmake/src/other/tcl/CMakeLists.txt
===
--- brlcad/branches/cmake/src/other/tcl/CMakeLists.txt 2010-12-17 13:23:00 UTC
(rev 41688)
+++ brlcad/branches/cmake/src/other/tcl/CMakeLists.txt 2010-12-17 19:00:32 UTC
(rev 41689)
@@ -139,6 +139,13 @@
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\\\)
+# Windows specific flags
+IF(WIN32)
+ SET(TCL_CFLAGS ${TCL_CFLAGS}
-DTCL_PIPE_DLL=\\\tclpip${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}.dll\\\)
+ SET(TCL_CFLAGS ${TCL_CFLAGS} -Dinline=__inline)
+ SET(TCL_CFLAGS ${TCL_CFLAGS} -Ot -Oi -fp:strict -Gs -GS -GL -MD)
+# SET(TCL_CFLAGS ${TCL_CFLAGS}
+ENDIF(WIN32)
IF(APPLE)
SET(TCL_CFLAGS ${TCL_CFLAGS} -DMAC_OSX_TCL=1)
@@ -684,7 +691,7 @@
SET(TCL_INCLUDE_PATH ${TCL_SOURCE_DIR}/generic ${TCL_SOURCE_DIR}/libtommath
${TCL_BINARY_DIR}/include)
IF(WIN32)
- SET(TCL_INCLUDE_PATH ${TCL_INCLUDE_PATH} ${TCL_SOURCE_DIR}/win)
+ SET(TCL_INCLUDE_PATH ${TCL_SOURCE_DIR}/win ${TCL_INCLUDE_PATH})
ELSE(WIN32)
SET(TCL_INCLUDE_PATH ${TCL_INCLUDE_PATH} ${TCL_SOURCE_DIR}/unix)
ENDIF(WIN32)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[41690] brlcad/branches/cmake/src/other/tcl/CMakeLists. txt
Revision: 41690
http://brlcad.svn.sourceforge.net/brlcad/?rev=41690view=rev
Author: starseeker
Date: 2010-12-17 20:00:52 + (Fri, 17 Dec 2010)
Log Message:
---
Apparently needed more flags - this appears to succeed with Visual C++ 2010
Modified Paths:
--
brlcad/branches/cmake/src/other/tcl/CMakeLists.txt
Modified: brlcad/branches/cmake/src/other/tcl/CMakeLists.txt
===
--- brlcad/branches/cmake/src/other/tcl/CMakeLists.txt 2010-12-17 19:00:32 UTC
(rev 41689)
+++ brlcad/branches/cmake/src/other/tcl/CMakeLists.txt 2010-12-17 20:00:52 UTC
(rev 41690)
@@ -141,10 +141,9 @@
# Windows specific flags
IF(WIN32)
+ SET(TCL_CFLAGS ${TCL_CFLAGS} -c -W3 -D _CRT_SECURE_NO_DEPRECATE -D
_CRT_NONSTDC_NO_DEP -Ot -Oi -fp:strict -Gs -GS -GL -MD)
SET(TCL_CFLAGS ${TCL_CFLAGS}
-DTCL_PIPE_DLL=\\\tclpip${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}.dll\\\)
- SET(TCL_CFLAGS ${TCL_CFLAGS} -Dinline=__inline)
- SET(TCL_CFLAGS ${TCL_CFLAGS} -Ot -Oi -fp:strict -Gs -GS -GL -MD)
-# SET(TCL_CFLAGS ${TCL_CFLAGS}
+ SET(TCL_CFLAGS ${TCL_CFLAGS} -Dinline=__inline -DBUILD_tcl)
ENDIF(WIN32)
IF(APPLE)
@@ -676,11 +675,11 @@
unix/tclLoadShl.c
)
-SET(TCL_SRCS ${TCL_GENERIC_SRCS} ${TCL_TOMMATH_SRCS} ${TCL_NOTIFY_SRCS}
${TCL_STUB_SRCS})
+SET(TCL_SRCS ${TCL_GENERIC_SRCS} ${TCL_TOMMATH_SRCS} ${TCL_STUB_SRCS})
IF(WIN32)
SET(TCL_SRCS ${TCL_SRCS} ${TCL_WIN_SRCS})
ELSE(WIN32)
- SET(TCL_SRCS ${TCL_SRCS} ${TCL_UNIX_SRCS})
+ SET(TCL_SRCS ${TCL_SRCS} ${TCL_NOTIFY_SRCS} ${TCL_UNIX_SRCS})
IF(APPLE)
SET(TCL_SRCS ${TCL_SRCS} ${TCL_OSX_SRCS} unix/tclLoadDyld.c)
ENDIF(APPLE)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[41692] brlcad/trunk/src/tclscripts/archer/CombEditFrame .tcl
Revision: 41692
http://brlcad.svn.sourceforge.net/brlcad/?rev=41692view=rev
Author: bob1961
Date: 2010-12-17 21:56:42 + (Fri, 17 Dec 2010)
Log Message:
---
Now using TkTable in CombEditFrame.
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl
Modified: brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl
===
--- brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl2010-12-17
21:55:10 UTC (rev 41691)
+++ brlcad/trunk/src/tclscripts/archer/CombEditFrame.tcl2010-12-17
21:56:42 UTC (rev 41692)
@@ -74,7 +74,6 @@
variable mMemberDataOrder {RotAet RotXyz RotArb Tra Sca}
variable mLastTabIndex -1
variable mTableData {RotAet 9 Rot (AET) RotXyz 9 Rot (XYZ) RotArb
10 Rot (Arbitrary) Tra 6 Translation Sca 10 Scale}
- variable mToggleSelectMode 0
method buildGeneralGUI {}
method buildShaderGUI {}
@@ -90,14 +89,11 @@
method packMemberDataIntoString {_tname}
method resetData {}
- method handleTablePopup {_win _x _y _X _Y}
+ method handleTablePopup {_index _X _Y}
method populateMembersMenu {_type _index _X _Y}
method addMemberCreationMenuEntries {_type _row}
- method setTableCol {_tname _col _val}
- method setTableVal {_tname _index _val}
method selectName {args}
method invertSelect {_tname}
- method toggleSelect {_tname _win _x _y}
method appendRow {_tname}
method insertRow {_type _row}
method deleteRow {_type _row}
@@ -566,19 +562,20 @@
::ttk::frame $itk_component(tabs).members$tname\F
} {}
itk_component add combMembers$tname {
- ::table $itk_component(combMembers$tname\F).members$tname \
+ ::cadwidgets::TkTable
$itk_component(combMembers$tname\F).members$tname \
+ [::itcl::scope mMemberData$tname] \
+ [subst $[subst mMemberHeadings$tname]] \
-cursor arrow \
-height 0 \
-maxheight 2000 \
-width 0 \
-rows 10 \
- -cols $cols \
-titlecols 1 \
-titlerows 1 \
- -colstretchmode all \
- -variable [::itcl::scope mMemberData$tname] \
+ -colstretchmode unset \
-validate 1 \
- -validatecommand [::itcl::code $this validateTableEntry %r %c
%S $tname]
+ -validatecommand [::itcl::code $this validateTableEntry %r %c
%S $tname] \
+ -tablePopupHandler [::itcl::code $this handleTablePopup]
} {}
# Set width of columns 0, 1 and 2
@@ -586,40 +583,11 @@
$itk_component(combMembers$tname) width 1 4
$itk_component(combMembers$tname) width 2 20
- # Create scrollbars
- itk_component add tableHScroll$tname {
- ::ttk::scrollbar $itk_component(combMembers$tname\F).tableHScroll \
- -orient horizontal
- } {}
-
- itk_component add tableVScroll$tname {
- ::ttk::scrollbar $itk_component(combMembers$tname\F).tableVScroll \
- -orient vertical
- } {}
-
- # Hook up scrollbars
- $itk_component(combMembers$tname) configure -xscrollcommand
$itk_component(tableHScroll$tname) set
- $itk_component(combMembers$tname) configure -yscrollcommand
$itk_component(tableVScroll$tname) set
- $itk_component(tableHScroll$tname) configure -command
$itk_component(combMembers$tname) xview
- $itk_component(tableVScroll$tname) configure -command
$itk_component(combMembers$tname) yview
-
- grid $itk_component(combMembers$tname)
$itk_component(tableVScroll$tname) -sticky nsew
- grid $itk_component(tableHScroll$tname) - -sticky nsew
-
+ grid $itk_component(combMembers$tname) -sticky nsew
grid columnconfigure $itk_component(combMembers$tname\F) 0 -weight 1
grid rowconfigure $itk_component(combMembers$tname\F) 0 -weight 1
$itk_component(combMembersTabs) add $itk_component(combMembers$tname\F)
-text $text
-
- bind $itk_component(combMembers$tname) Button-1 [::itcl::code $this
toggleSelect $tname %W %x %y]
- bind $itk_component(combMembers$tname) Button-3 [::itcl::code $this
handleTablePopup %W %x %y %X %Y]
- bind $itk_component(combMembers$tname) B3-Motion {break}
-
- $itk_component(combMembers$tname) tag col select_col 0
- $itk_component(combMembers$tname) tag configure select_col \
- -relief raised
- $itk_component(combMembers$tname) tag configure title \
- -relief raised
}
grid columnconfigure $itk_component(combMembersTabs) 0 -weight 1
@@ -804,10 +772,9 @@
initGeometry $gdata
}
-::itcl::body CombEditFrame::handleTablePopup {_win _x _y _X _Y} {
-set index [$_win index @$_x,$_y]
+::itcl::body
[brlcad-commits] SF.net SVN: brlcad:[41691] brlcad/trunk/src/tclscripts/lib
Revision: 41691
http://brlcad.svn.sourceforge.net/brlcad/?rev=41691view=rev
Author: bob1961
Date: 2010-12-17 21:55:10 + (Fri, 17 Dec 2010)
Log Message:
---
This is the initial check-in of cadwidgets::TkTable. It's intended to be a
relatively thin wrapper around tktable for housing functionality that would
commonly be written for an application trying to use tktable. This includes
updates to Makefile.am and tclIndex.
Modified Paths:
--
brlcad/trunk/src/tclscripts/lib/Makefile.am
brlcad/trunk/src/tclscripts/lib/tclIndex
Added Paths:
---
brlcad/trunk/src/tclscripts/lib/TkTable.tcl
Modified: brlcad/trunk/src/tclscripts/lib/Makefile.am
===
--- brlcad/trunk/src/tclscripts/lib/Makefile.am 2010-12-17 20:00:52 UTC (rev
41690)
+++ brlcad/trunk/src/tclscripts/lib/Makefile.am 2010-12-17 21:55:10 UTC (rev
41691)
@@ -22,6 +22,7 @@
Splash.tcl \
Table.tcl \
TableView.tcl \
+ TkTable.tcl \
View.tcl \
ViewAxesControl.tcl
Added: brlcad/trunk/src/tclscripts/lib/TkTable.tcl
===
--- brlcad/trunk/src/tclscripts/lib/TkTable.tcl (rev 0)
+++ brlcad/trunk/src/tclscripts/lib/TkTable.tcl 2010-12-17 21:55:10 UTC (rev
41691)
@@ -0,0 +1,232 @@
+# T K T A B L E . T C L
+# BRL-CAD
+#
+# Copyright (c) 1998-2010 United States Government as represented by
+# the U.S. Army Research Laboratory.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License
+# version 2.1 as published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this file; see the file named COPYING for more
+# information.
+#
+###
+#
+# Description -
+# The TkTable class wraps tktable with common functionality.
+#
+
+::itcl::class cadwidgets::TkTable {
+inherit itk::Widget
+
+constructor {_datavar _headings args} {}
+destructor {}
+
+itk_option define -dataCallback dataCallback DataCallback
+itk_option define -tablePopupHandler tablePopupHandler TablePopupHandler
+
+public {
+ method setDataEntry {_index _val}
+ method setTableCol {_col _val}
+ method setTableVal {_index _val}
+ method width {args}
+}
+
+protected {
+ variable mTableDataVar
+ variable mTableHeadings
+ variable mToggleSelectMode 0
+
+ method handleTablePopup {_win _x _y _X _Y}
+ method toggleSelect {_win _x _y}
+}
+
+private {}
+}
+
+#
+#OPTIONS
+#
+
+
+#
+# CONSTRUCTOR
+#
+
+::itcl::body cadwidgets::TkTable::constructor {_datavar _headings args} {
+set mTableDataVar $_datavar
+set mTableHeadings $_headings
+
+set numcols [llength $_headings]
+
+itk_component add table {
+ ::table $itk_interior.table \
+ -cols $numcols \
+ -variable $mTableDataVar
+} {
+ keep -anchor -autoclear -background -bordercursor -borderwidth \
+ -browsecommand -cache -colorigin -colseparator \
+ -colstretchmode -coltagcommand -colwidth -command -cursor -drawmode
\
+ -ellipsis -exportselection -flashmode -flashtime -font -foreground \
+ -height -highlightbackground -highlightcolor -highlightthickness \
+ -insertbackground -insertborderwidth -insertofftime -insertontime \
+ -insertwidth -invertselected -ipadx -ipady -justify -maxheight \
+ -maxwidth -multiline -padx -pady -relief -resizeborders -rowheight \
+ -roworigin -rows -rowseparator -rowstretchmode -rowtagcommand \
+ -selectioncommand -selectmode -selecttitles -selecttype
-sparsearray \
+ -state -takefocus -titlecols -titlerows -usecommand -validate \
+ -validatecommand -width -wrap
+}
+
+# Hide these options from users of TkTable
+#-cols
+#-variable
+#-xscrollcommand -yscrollcommand
+
+# Set table headings
+set col 0
+foreach heading $mTableHeadings {
+ set $mTableDataVar\(0,$col\) $heading
+ incr col
+}
+
+# Create scrollbars
+itk_component add tableHScroll {
+ ::ttk::scrollbar $itk_interior.tableHScroll \
+ -orient horizontal
+} {}
+
+itk_component add tableVScroll {
+
[brlcad-commits] SF.net SVN: brlcad:[41693] brlcad/branches/cmake/src/other/tcl/CMakeLists. txt
Revision: 41693
http://brlcad.svn.sourceforge.net/brlcad/?rev=41693view=rev
Author: starseeker
Date: 2010-12-17 21:59:20 + (Fri, 17 Dec 2010)
Log Message:
---
It's not just package string - ANY space in a -D argument doesn't seem to work
with Visual Studio. Since the nmake build for Tcl doesn't seem to set these
anyway, wrap them to avoid problems. Tried to quite, and that didn't work
either.
Modified Paths:
--
brlcad/branches/cmake/src/other/tcl/CMakeLists.txt
Modified: brlcad/branches/cmake/src/other/tcl/CMakeLists.txt
===
--- brlcad/branches/cmake/src/other/tcl/CMakeLists.txt 2010-12-17 21:56:42 UTC
(rev 41692)
+++ brlcad/branches/cmake/src/other/tcl/CMakeLists.txt 2010-12-17 21:59:20 UTC
(rev 41693)
@@ -117,27 +117,26 @@
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}\\\)
-# FIXME - Figure out why Visual Studio isn't liking the space in the
PACKAGE_STRING
-IF(WIN32)
- SET(TCL_CFLAGS ${TCL_CFLAGS}
-DPACKAGE_STRING=\\\tcl_${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}\\\)
-ELSE(WIN32)
- SET(TCL_CFLAGS ${TCL_CFLAGS} -DPACKAGE_STRING=\\\tcl\\
${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}\\\)
-ENDIF(WIN32)
SET(TCL_CFLAGS ${TCL_CFLAGS} -DPACKAGE_BUGREPORT=\\)
+# FIXME - Figure out why Visual Studio isn't liking the space in -D
definitions. This isn't
+# urgent, as the Tcl Windows build logic doesn't seem to define most of these
either
+IF(NOT WIN32)
+ SET(TCL_CFLAGS ${TCL_CFLAGS} -DPACKAGE_STRING=\\\tcl\\
${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}\\\)
+ 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\\\)
+ENDIF(NOT WIN32)
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\\\)
# Windows specific flags
IF(WIN32)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[41694] brlcad/branches/cmake/src/other/tcl/CMakeLists. txt
Revision: 41694
http://brlcad.svn.sourceforge.net/brlcad/?rev=41694view=rev
Author: starseeker
Date: 2010-12-17 22:53:36 + (Fri, 17 Dec 2010)
Log Message:
---
No good - need these definitions on Windows too. Right now, it doesn't look
like I can get a space through the CMake output for Visual Studio preprocessor
definitions no matter how I quote - have asked the CMake list for help, may
need to consider some sort of special purpose config.h file and alter the
Tcl/Tk source code.
Modified Paths:
--
brlcad/branches/cmake/src/other/tcl/CMakeLists.txt
Modified: brlcad/branches/cmake/src/other/tcl/CMakeLists.txt
===
--- brlcad/branches/cmake/src/other/tcl/CMakeLists.txt 2010-12-17 21:59:20 UTC
(rev 41693)
+++ brlcad/branches/cmake/src/other/tcl/CMakeLists.txt 2010-12-17 22:53:36 UTC
(rev 41694)
@@ -122,19 +122,19 @@
# urgent, as the Tcl Windows build logic doesn't seem to define most of these
either
IF(NOT WIN32)
SET(TCL_CFLAGS ${TCL_CFLAGS} -DPACKAGE_STRING=\\\tcl\\
${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}\\\)
- 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\\\)
ENDIF(NOT WIN32)
+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} -DSTDC_HEADERS=1)
SET(TCL_CFLAGS ${TCL_CFLAGS}
-DTCL_SHLIB_EXT=\\\${CMAKE_SHARED_LIBRARY_SUFFIX}\\\)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[41696] brlcad/branches/cmake/src/other/tk/CMakeLists. txt
Revision: 41696 http://brlcad.svn.sourceforge.net/brlcad/?rev=41696view=rev Author: starseeker Date: 2010-12-17 23:44:32 + (Fri, 17 Dec 2010) Log Message: --- Couple of missing files - need to make sure we've got everything included and set up correctly, still more to do (check tk.rc - what is it?) 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-12-17 23:20:24 UTC (rev 41695) +++ brlcad/branches/cmake/src/other/tk/CMakeLists.txt 2010-12-17 23:44:32 UTC (rev 41696) @@ -435,6 +435,8 @@ xlib/xgc.c xlib/ximage.c xlib/xutil.c + win/stubs.c + win/winMain.c win/tkWin32Dll.c win/tkWin3d.c win/tkWinButton.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Lotusphere 2011 Register now for Lotusphere 2011 and learn how to connect the dots, take your collaborative environment to the next level, and enter the era of Social Business. http://p.sf.net/sfu/lotusphere-d2d ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[41697] brlcad/branches/cmake/src/other/tk/CMakeLists. txt
Revision: 41697
http://brlcad.svn.sourceforge.net/brlcad/?rev=41697view=rev
Author: starseeker
Date: 2010-12-18 00:24:56 + (Sat, 18 Dec 2010)
Log Message:
---
Apparently a successful build of Tk,although not functionally tested.
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-12-17 23:44:32 UTC
(rev 41696)
+++ brlcad/branches/cmake/src/other/tk/CMakeLists.txt 2010-12-18 00:24:56 UTC
(rev 41697)
@@ -61,6 +61,9 @@
SET(TK_VERSION ${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}.${TK_PATCH_LEVEL})
+# For Windows, we need the Resource Compiler language
+ENABLE_LANGUAGE(RC)
+
#-
# Output directories.
IF(NOT LIBRARY_OUTPUT_PATH)
@@ -115,7 +118,7 @@
SET(TK_CFLAGS ${TK_CFLAGS} -DSTDC_HEADERS=1)
IF(WIN32)
- SET(TK_CFLAGS ${TK_CFLAGS} -c -W3 -D_CRT_SECURE_NO_DEPRECATE
-D_CRT_NONSTDC_NO_DEPRECATE -Ot -Oi -fp:strict -Gs -GS -GL -MD -DBUILD_tk
-BUILD_ttk -DSUPPORT_CONFIG_EMBEDDED -DHAVE_UXTHEME_H=1 -DUSE_TCL_STUBS)
+ SET(TK_CFLAGS ${TK_CFLAGS} -c -W3 -D_CRT_SECURE_NO_DEPRECATE
-D_CRT_NONSTDC_NO_DEPRECATE -Ot -Oi -fp:strict -Gs -GS -GL -MD -DBUILD_tk
-BUILD_ttk -DSUPPORT_CONFIG_EMBEDDED -DHAVE_UXTHEME_H=1 -DUSE_TCL_STUBS)
ENDIF(WIN32)
IF(APPLE)
@@ -271,6 +274,7 @@
generic/tkImgGIF.c
generic/tkImgPPM.c
generic/tkImgPhoto.c
+ generic/tkImgUtil.c
generic/tkListbox.c
generic/tkMain.c
generic/tkMenu.c
@@ -437,6 +441,12 @@
xlib/xutil.c
win/stubs.c
win/winMain.c
+ win/rc/tk.rc
+ generic/tkFileFilter.c
+ generic/tkMacWinMenu.c
+ generic/tkPointer.c
+ unix/tkUnixMenubu.c
+ unix/tkUnixScale.c
win/tkWin32Dll.c
win/tkWin3d.c
win/tkWinButton.c
@@ -555,7 +565,11 @@
ENDIF(TK-ENABLE_FREETYPE)
add_library(tk ${TK_SRCS})
+IF(WIN32)
+target_link_libraries(tk tclstub ${COREFOUNDATION_FRAMEWORK} ${X11_TK_LIBS}
${TK_FREETYPE_LIBRARIES} ${TK_FONTCONFIG_LIBRARY})
+ELSE(WIN32)
target_link_libraries(tk tcl ${COREFOUNDATION_FRAMEWORK} ${X11_TK_LIBS}
${TK_FREETYPE_LIBRARIES} ${TK_FONTCONFIG_LIBRARY})
+ENDIF(WIN32)
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.
--
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[41701] brlcad/branches/cmake/src
Revision: 41701
http://brlcad.svn.sourceforge.net/brlcad/?rev=41701view=rev
Author: starseeker
Date: 2010-12-18 03:32:00 + (Sat, 18 Dec 2010)
Log Message:
---
Wrap most of the commands that depend on libtermio and libcursor, as well as
those libraries, in a conditional based on the results of searching for Curses.
bwish and mged still need to be handled, but will take more study - they DO
work on windows but need libtermio, so need to check the msvc project files.
Modified Paths:
--
brlcad/branches/cmake/src/burst/CMakeLists.txt
brlcad/branches/cmake/src/fb/CMakeLists.txt
brlcad/branches/cmake/src/fbed/CMakeLists.txt
brlcad/branches/cmake/src/lgt/CMakeLists.txt
brlcad/branches/cmake/src/libcursor/CMakeLists.txt
brlcad/branches/cmake/src/libtermio/CMakeLists.txt
Modified: brlcad/branches/cmake/src/burst/CMakeLists.txt
===
--- brlcad/branches/cmake/src/burst/CMakeLists.txt 2010-12-18 03:05:12 UTC
(rev 41700)
+++ brlcad/branches/cmake/src/burst/CMakeLists.txt 2010-12-18 03:32:00 UTC
(rev 41701)
@@ -23,7 +23,9 @@
ui.c
)
-BRLCAD_ADDEXEC(burst ${burst_SOURCES} librt libfb libtermio
${TERMLIB_LIBRARY})
+if(CURSES_HAVE_CURSES_H)
+ BRLCAD_ADDEXEC(burst ${burst_SOURCES} librt libfb libtermio
${TERMLIB_LIBRARY})
+endif(CURSES_HAVE_CURSES_H)
SET(burst_noinst_HEADERS
Modified: brlcad/branches/cmake/src/fb/CMakeLists.txt
===
--- brlcad/branches/cmake/src/fb/CMakeLists.txt 2010-12-18 03:05:12 UTC (rev
41700)
+++ brlcad/branches/cmake/src/fb/CMakeLists.txt 2010-12-18 03:32:00 UTC (rev
41701)
@@ -28,7 +28,10 @@
BRLCAD_ADDEXEC(fbclear fbclear.c libfb)
BRLCAD_ADDEXEC(fbcmap fbcmap.c libfb)
BRLCAD_ADDEXEC(fbcmrot fbcmrot.c libfb)
-BRLCAD_ADDEXEC(fbcolor fbcolor.c libfb libtermio)
+
+IF(CURSES_HAVE_CURSES_H)
+ BRLCAD_ADDEXEC(fbcolor fbcolor.c libfb libtermio)
+ENDIF(CURSES_HAVE_CURSES_H)
BRLCAD_ADDEXEC(fbfade fbfade.c ioutil.c libfb)
BRLCAD_ADDEXEC(fbframe fbframe.c libfb)
BRLCAD_ADDEXEC(fbfree fbfree.c libfb)
@@ -38,14 +41,18 @@
BRLCAD_ADDEXEC(fbhelp fbhelp.c libfb)
BRLCAD_ADDEXEC(fblabel fblabel.c libfb)
BRLCAD_ADDEXEC(fbline fbline.c libfb)
-BRLCAD_ADDEXEC(fbpoint fbpoint.c libfb libbu libtermio libpkg)
+IF(CURSES_HAVE_CURSES_H)
+ BRLCAD_ADDEXEC(fbpoint fbpoint.c libfb libbu libtermio libpkg)
+ENDIF(CURSES_HAVE_CURSES_H)
BRLCAD_ADDEXEC(fbscanplot fbscanplot.c libfb)
BRLCAD_ADDEXEC(fbstretch fbstretch.c ioutil.c libfb)
IF(BRLCAD-ENABLE_TK)
BRLCAD_ADDEXEC(fbthreadtest fbthreadtest libfb ${TK_LIBRARY})
SET_TARGET_PROPERTIES(fbthreadtest PROPERTIES COMPILE_DEFINITIONS
IF_TK)
ENDIF(BRLCAD-ENABLE_TK)
-BRLCAD_ADDEXEC(fbzoom fbzoom.c libfb libtermio)
+IF(CURSES_HAVE_CURSES_H)
+ BRLCAD_ADDEXEC(fbzoom fbzoom.c libfb libtermio)
+ENDIF(CURSES_HAVE_CURSES_H)
BRLCAD_ADDEXEC(gif-fb gif-fb.c ioutil.c libfb)
BRLCAD_ADDEXEC(gif2fb gif2fb.c libfb)
BRLCAD_ADDEXEC(orle-fb orle-fb.c libfb liborle)
@@ -55,7 +62,9 @@
BRLCAD_ADDEXEC(pl-fb pl-fb.c libfb)
BRLCAD_ADDEXEC(png-fb png-fb.c libfb)
BRLCAD_ADDEXEC(polar-fb polar-fb.c libfb)
-BRLCAD_ADDEXEC(pp-fb pp-fb.c libfb libtermio)
+IF(CURSES_HAVE_CURSES_H)
+ BRLCAD_ADDEXEC(pp-fb pp-fb.c libfb libtermio)
+ENDIF(CURSES_HAVE_CURSES_H)
BRLCAD_ADDEXEC(rle-fb rle-fb.c libfb ${UTAHRLE_LIBRARY})
BRLCAD_ADDEXEC(spm-fb spm-fb.c libfb libbn)
Modified: brlcad/branches/cmake/src/fbed/CMakeLists.txt
===
--- brlcad/branches/cmake/src/fbed/CMakeLists.txt 2010-12-18 03:05:12 UTC
(rev 41700)
+++ brlcad/branches/cmake/src/fbed/CMakeLists.txt 2010-12-18 03:32:00 UTC
(rev 41701)
@@ -18,7 +18,8 @@
squash.c
try.c
)
+IF(CURSES_HAVE_CURSES_H)
+ BRLCAD_ADDEXEC(fbed ${fbed_SOURCES} libfb libvfont libtermio libcursor
${TERMLIB_LIBRARY})
-BRLCAD_ADDEXEC(fbed ${fbed_SOURCES} libfb libvfont libtermio libcursor
${TERMLIB_LIBRARY})
-
-install(FILES fbed.1 DESTINATION ${MAN_DIR}/man1)
+ install(FILES fbed.1 DESTINATION ${MAN_DIR}/man1)
+ENDIF(CURSES_HAVE_CURSES_H)
Modified: brlcad/branches/cmake/src/lgt/CMakeLists.txt
===
--- brlcad/branches/cmake/src/lgt/CMakeLists.txt2010-12-18 03:05:12 UTC
(rev 41700)
+++ brlcad/branches/cmake/src/lgt/CMakeLists.txt2010-12-18 03:32:00 UTC
(rev 41701)
@@ -24,7 +24,9 @@
trie.c
)
-BRLCAD_ADDEXEC(lgt ${lgt_SOURCES} librt libfb libtermio libvfont libcursor)
-SET_TARGET_PROPERTIES(lgt PROPERTIES COMPILE_DEFINITIONS BEHIND_ME_TOL=0.05)
+IF(CURSES_HAVE_CURSES_H)
+ BRLCAD_ADDEXEC(lgt ${lgt_SOURCES} librt libfb libtermio libvfont
libcursor)
+ SET_TARGET_PROPERTIES(lgt PROPERTIES COMPILE_DEFINITIONS
BEHIND_ME_TOL=0.05)
-install(FILES lgt.1 DESTINATION ${MAN_DIR}/man1)
+ install(FILES lgt.1 DESTINATION ${MAN_DIR}/man1)
[brlcad-commits] SF.net SVN: brlcad:[41699] brlcad/branches/cmake/src/other
Revision: 41699
http://brlcad.svn.sourceforge.net/brlcad/?rev=41699view=rev
Author: starseeker
Date: 2010-12-18 03:02:01 + (Sat, 18 Dec 2010)
Log Message:
---
More rc file stuff.
Modified Paths:
--
brlcad/branches/cmake/src/other/tcl/CMakeLists.txt
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-12-18 02:58:47 UTC
(rev 41698)
+++ brlcad/branches/cmake/src/other/tcl/CMakeLists.txt 2010-12-18 03:02:01 UTC
(rev 41699)
@@ -63,6 +63,12 @@
SET(TCL_VERSION ${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}.${TCL_PATCH_LEVEL})
+# For Windows, we need the Resource Compiler language
+IF(WIN32)
+ ENABLE_LANGUAGE(RC)
+ENDIF(WIN32)
+
+
#-
# Output directories.
IF(NOT LIBRARY_OUTPUT_PATH)
@@ -627,6 +633,7 @@
)
SET(TCL_WIN_SRCS
+ win/tcl.rc
win/tclAppInit.c
win/tclWin32Dll.c
win/tclWinChan.c
@@ -699,7 +706,7 @@
)
IF(WIN32)
- SET(TCLSH_SRCS win/tclAppInit.c)
+ SET(TCLSH_SRCS win/tclAppInit.c win/tclsh.rc)
ELSE(WIN32)
SET(TCLSH_SRCS unix/tclAppInit.c)
ENDIF(WIN32)
Modified: brlcad/branches/cmake/src/other/tk/CMakeLists.txt
===
--- brlcad/branches/cmake/src/other/tk/CMakeLists.txt 2010-12-18 02:58:47 UTC
(rev 41698)
+++ brlcad/branches/cmake/src/other/tk/CMakeLists.txt 2010-12-18 03:02:01 UTC
(rev 41699)
@@ -532,7 +532,7 @@
IF(NOT WIN32)
SET(WISH_SRCS unix/tkAppInit.c)
ELSE(NOT WIN32)
-SET(WISH_SRCS win/winMain.c)
+SET(WISH_SRCS win/winMain.c win/wish.rc)
ENDIF(NOT WIN32)
SET(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} ${TK_CFLAGS})
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[41700] brlcad/branches/cmake/src/other/tk/CMakeLists. txt
Revision: 41700 http://brlcad.svn.sourceforge.net/brlcad/?rev=41700view=rev Author: starseeker Date: 2010-12-18 03:05:12 + (Sat, 18 Dec 2010) Log Message: --- Check this, but it looks like tkImgUtil may be needed only for Windows. 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-12-18 03:02:01 UTC (rev 41699) +++ brlcad/branches/cmake/src/other/tk/CMakeLists.txt 2010-12-18 03:05:12 UTC (rev 41700) @@ -276,7 +276,6 @@ generic/tkImgGIF.c generic/tkImgPPM.c generic/tkImgPhoto.c - generic/tkImgUtil.c generic/tkListbox.c generic/tkMain.c generic/tkMenu.c @@ -447,6 +446,7 @@ generic/tkFileFilter.c generic/tkMacWinMenu.c generic/tkPointer.c + generic/tkImgUtil.c unix/tkUnixMenubu.c unix/tkUnixScale.c win/tkWin32Dll.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- Lotusphere 2011 Register now for Lotusphere 2011 and learn how to connect the dots, take your collaborative environment to the next level, and enter the era of Social Business. http://p.sf.net/sfu/lotusphere-d2d ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[41702] brlcad/branches/cmake/misc/CMake/FindTCL.cmake
Revision: 41702
http://brlcad.svn.sourceforge.net/brlcad/?rev=41702view=rev
Author: starseeker
Date: 2010-12-18 04:35:51 + (Sat, 18 Dec 2010)
Log Message:
---
Whoops, mismatched if and endif lines
Modified Paths:
--
brlcad/branches/cmake/misc/CMake/FindTCL.cmake
Modified: brlcad/branches/cmake/misc/CMake/FindTCL.cmake
===
--- brlcad/branches/cmake/misc/CMake/FindTCL.cmake 2010-12-18 03:32:00 UTC
(rev 41701)
+++ brlcad/branches/cmake/misc/CMake/FindTCL.cmake 2010-12-18 04:35:51 UTC
(rev 41702)
@@ -489,10 +489,10 @@
MACRO(VALIDATE_TK_VARIABLES validvar)
IF(NOT TK_INCLUDE_PATH AND TCL_NEED_HEADERS)
SET(${validvar} 0)
- ENDIF(NOT TCL_INCLUDE_PATH AND TCL_NEED_HEADERS)
+ ENDIF(NOT TK_INCLUDE_PATH AND TCL_NEED_HEADERS)
IF(NOT TK_LIBRARY AND TCL_NEED_HEADERS)
SET(${validvar} 0)
- ENDIF(NOT TK_LIBRARY)
+ ENDIF(NOT TK_LIBRARY AND TCL_NEED_HEADERS)
IF(NOT TK_STUB_LIBRARY AND TCL_NEED_STUB_LIBS AND TCL_NEED_HEADERS)
SET(${validvar} 0)
ENDIF(NOT TK_STUB_LIBRARY AND TCL_NEED_STUB_LIBS AND TCL_NEED_HEADERS)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[41703] brlcad/branches/cmake/src/other/tk/CMakeLists. txt
Revision: 41703
http://brlcad.svn.sourceforge.net/brlcad/?rev=41703view=rev
Author: starseeker
Date: 2010-12-18 04:40:08 + (Sat, 18 Dec 2010)
Log Message:
---
Whoops, wish.rc is in win/rc, not win
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-12-18 04:35:51 UTC
(rev 41702)
+++ brlcad/branches/cmake/src/other/tk/CMakeLists.txt 2010-12-18 04:40:08 UTC
(rev 41703)
@@ -532,7 +532,7 @@
IF(NOT WIN32)
SET(WISH_SRCS unix/tkAppInit.c)
ELSE(NOT WIN32)
-SET(WISH_SRCS win/winMain.c win/wish.rc)
+SET(WISH_SRCS win/winMain.c win/rc/wish.rc)
ENDIF(NOT WIN32)
SET(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} ${TK_CFLAGS})
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[41704] brlcad/branches/cmake
Revision: 41704
http://brlcad.svn.sourceforge.net/brlcad/?rev=41704view=rev
Author: starseeker
Date: 2010-12-18 04:54:12 + (Sat, 18 Dec 2010)
Log Message:
---
Make a stab at adding conditionally adding config_win.h to brlcad_config.h
Modified Paths:
--
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/include/config_win.h
Modified: brlcad/branches/cmake/CMakeLists.txt
===
--- brlcad/branches/cmake/CMakeLists.txt2010-12-18 04:40:08 UTC (rev
41703)
+++ brlcad/branches/cmake/CMakeLists.txt2010-12-18 04:54:12 UTC (rev
41704)
@@ -346,7 +346,14 @@
SET(CONFIG_H_FILE ${BRLCAD_BINARY_DIR}/include/brlcad_config.h.in)
FILE(WRITE ${CONFIG_H_FILE} / Define statements for CMake /\n)
+FILE(APPEND ${CONFIG_H_FILE} #ifndef __CONFIG_H__\n)
+FILE(APPEND ${CONFIG_H_FILE} #define __CONFIG_H__\n)
+# If we're building on Windows, start off with the config_win.h file
+IF(WIN32)
+ FILE(APPEND ${CONFIG_H_FILE} #include \config_win.h\\n)
+ENDIF(WIN32)
+
# Set up some of the define statements for path information and other basics
FILE(APPEND ${CONFIG_H_FILE} #define PACKAGE \brlcad\\n)
FILE(APPEND ${CONFIG_H_FILE} #define PACKAGE_BUGREPORT
\http://brlcad.org\\n;)
@@ -917,6 +924,7 @@
FILE(APPEND ${CONFIG_H_FILE} #define BUILD_SOURCE_DIR
\${CMAKE_SOURCE_DIR}\\n)
# Now that all the tests are done, configure the brlcad_config.h file:
+FILE(APPEND ${CONFIG_H_FILE} #endif /* __CONFIG_H__ */\n)
configure_file(${CONFIG_H_FILE} ${BRLCAD_BINARY_DIR}/include/brlcad_config.h)
Modified: brlcad/branches/cmake/include/config_win.h
===
--- brlcad/branches/cmake/include/config_win.h 2010-12-18 04:40:08 UTC (rev
41703)
+++ brlcad/branches/cmake/include/config_win.h 2010-12-18 04:54:12 UTC (rev
41704)
@@ -26,9 +26,6 @@
*
*/
-#ifndef __CONFIG_H__
-#define __CONFIG_H__
-
#ifndef IGNORE_CONFIG_H
#if defined(_WIN32)
@@ -62,12 +59,6 @@
# define EXPAND_IN_STRING_INTERN(x) #x
#endif
-/* FIXME: this is bogus, fixed path should not be in any source file */
-#define INSTALL_DIRECTORYC:/brlcad MAJOR_VERSION_STRING _
MINOR_VERSION_STRING _ PATCH_VERSION_STRING
-
-/* FIXME: this is bogus, should not need to manually set the version in here */
-#define IWIDGETS_VERSION 4.0.2
-
/*
* declare results of configure tests
*/
@@ -311,7 +302,6 @@
#endif /* if defined(_WIN32) */
#endif /* ifndef IGNORE_CONFIG_H */
-#endif /* __CONFIG_H__ */
/** @} */
/*
* Local Variables:
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
