Revision: 41406
http://brlcad.svn.sourceforge.net/brlcad/?rev=41406&view=rev
Author: starseeker
Date: 2010-11-19 20:00:19 +0000 (Fri, 19 Nov 2010)
Log Message:
-----------
Start getting set up for a Windows tcl/tk build attempt (gulp)
Modified Paths:
--------------
brlcad/branches/cmake/src/other/CMakeLists.txt
brlcad/branches/cmake/src/other/tk/CMakeLists.txt
Modified: brlcad/branches/cmake/src/other/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/CMakeLists.txt 2010-11-19 15:40:10 UTC
(rev 41405)
+++ brlcad/branches/cmake/src/other/CMakeLists.txt 2010-11-19 20:00:19 UTC
(rev 41406)
@@ -167,7 +167,11 @@
#THIRD_PARTY_AUTOCONF_EXTERNAL_PROJECT(ITCL itcl src/other/incrTcl/itcl ""
"--with-tcl=${TCL_CONF_PREFIX};--with-tcl-private=${CMAKE_SOURCE_DIR}/src/other/tcl")
IF(BRLCAD_BUILD_LOCAL_ITCL)
IF(NOT BRLCAD_BUILD_LOCAL_TCL)
- SET(TCL_INCLUDE_PATH ${TCL_INCLUDE_PATH}
${CMAKE_CURRENT_SOURCE_DIR}/tcl/generic ${CMAKE_CURRENT_SOURCE_DIR}/tcl/unix
${CMAKE_CURRENT_SOURCE_DIR}/tcl/libtommath)
+ IF(WIN32)
+ SET(TCL_INCLUDE_PATH ${TCL_INCLUDE_PATH}
${CMAKE_CURRENT_SOURCE_DIR}/tcl/generic ${CMAKE_CURRENT_SOURCE_DIR}/tcl/win
${CMAKE_CURRENT_SOURCE_DIR}/tcl/libtommath)
+ ELSE(WIN32)
+ SET(TCL_INCLUDE_PATH ${TCL_INCLUDE_PATH}
${CMAKE_CURRENT_SOURCE_DIR}/tcl/generic ${CMAKE_CURRENT_SOURCE_DIR}/tcl/unix
${CMAKE_CURRENT_SOURCE_DIR}/tcl/libtommath)
+ ENDIF(WIN32)
ENDIF(NOT BRLCAD_BUILD_LOCAL_TCL)
ADD_SUBDIRECTORY(incrTcl/itcl)
ADD_DEPENDENCIES(itcl tcl)
@@ -185,7 +189,11 @@
#THIRD_PARTY_AUTOCONF_EXTERNAL_PROJECT(ITK itk src/other/incrTcl/itk ""
"--with-tcl=${TCL_CONF_PREFIX};--with-tk=${TK_CONF_PREFIX};--with-tcl-private=${CMAKE_SOURCE_DIR}/src/other/tcl;--with-tk-private=${CMAKE_SOURCE_DIR}/src/other/tk")
IF(BRLCAD_BUILD_LOCAL_ITK)
IF(NOT BRLCAD_BUILD_LOCAL_TK)
- SET(TK_INCLUDE_PATH ${TK_INCLUDE_PATH}
${CMAKE_CURRENT_SOURCE_DIR}/tk/generic ${CMAKE_CURRENT_SOURCE_DIR}/tk/bitmaps)
+ IF(WIN32)
+ SET(TK_INCLUDE_PATH ${TK_INCLUDE_PATH}
${CMAKE_CURRENT_SOURCE_DIR}/tk/generic ${CMAKE_CURRENT_SOURCE_DIR}/tk/bitmaps)
+ ELSE(WIN32)
+ SET(TK_INCLUDE_PATH ${TK_INCLUDE_PATH}
${CMAKE_CURRENT_SOURCE_DIR}/tk/generic ${CMAKE_CURRENT_SOURCE_DIR}/tk/win
${CMAKE_CURRENT_SOURCE_DIR}/tk/bitmaps)
+ ENDIF(WIN32)
ENDIF(NOT BRLCAD_BUILD_LOCAL_TK)
ADD_SUBDIRECTORY(incrTcl/itk)
ADD_DEPENDENCIES(itk itcl tcl tk)
Modified: brlcad/branches/cmake/src/other/tk/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tk/CMakeLists.txt 2010-11-19 15:40:10 UTC
(rev 41405)
+++ brlcad/branches/cmake/src/other/tk/CMakeLists.txt 2010-11-19 20:00:19 UTC
(rev 41406)
@@ -162,10 +162,12 @@
find_library(FONTCONFIG_LIBRARY fontconfig)
ENDIF(APPLE)
-find_package(X11)
-find_package(Freetype)
+IF(NOT WIN32)
+ find_package(X11)
+ find_package(Freetype)
-SET(TK_WINDOWINGSYSTEM X11)
+ SET(TK_WINDOWINGSYSTEM X11)
+ENDIF(NOT WIN32)
IF(${CMAKE_SYSTEM_NAME} MATCHES "^Darwin$")
CHECK_FUNCTION_EXISTS_D(getattrlist HAVE_GETATTRLIST)
@@ -422,6 +424,35 @@
)
SET(TK_WIN_SRCS
+ tkWin32Dll.c
+ tkWin3d.c
+ tkWinButton.c
+ tkWinClipboard.c
+ tkWinColor.c
+ tkWinConfig.c
+ tkWinCursor.c
+ tkWinDialog.c
+ tkWinDraw.c
+ tkWinEmbed.c
+ tkWinFont.c
+ tkWinImage.c
+ tkWinInit.c
+ tkWinKey.c
+ tkWinMenu.c
+ tkWinPixmap.c
+ tkWinPointer.c
+ tkWinRegion.c
+ tkWinScrlbr.c
+ tkWinSend.c
+ tkWinSendCom.c
+ tkWinTest.c
+ tkWinWindow.c
+ tkWinWm.c
+ tkWinX.c
+ ttkWinMonitor.c
+ ttkWinTheme.c
+ ttkWinXPTheme.c
+ winMain.c
)
SET(TK_SRCS ${TK_GENERIC_SRCS} ${TTK_SRCS})
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today
http://p.sf.net/sfu/msIE9-sfdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
