Revision: 41020
http://brlcad.svn.sourceforge.net/brlcad/?rev=41020&view=rev
Author: starseeker
Date: 2010-10-17 00:02:59 +0000 (Sun, 17 Oct 2010)
Log Message:
-----------
Try Cmake version of iwidgets.
Modified Paths:
--------------
brlcad/branches/cmake/src/other/CMakeLists.txt
brlcad/branches/cmake/src/other/incrTcl/iwidgets/CMakeLists.txt
Modified: brlcad/branches/cmake/src/other/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/CMakeLists.txt 2010-10-16 23:08:57 UTC
(rev 41019)
+++ brlcad/branches/cmake/src/other/CMakeLists.txt 2010-10-17 00:02:59 UTC
(rev 41020)
@@ -211,13 +211,9 @@
SET(BRLCAD_BUILD_LOCAL_INCRTCL OFF CACHE STRING "incrtcl build status"
FORCE)
ENDIF(BRLCAD_BUILD_LOCAL_ITCL OR BRLCAD_BUILD_LOCAL_ITK)
-IF(MSVC)
- THIRD_PARTY_NMAKE_EXTERNAL_PROJECT(IWIDGETS iwidgets
src/other/incrTcl/iwidgets win
"TCLDIR=${CMAKE_SOURCE_DIR}/src/other/tcl;TKDIR=${CMAKE_SOURCE_DIR}/src/other/tk;ITCLDIR=${CMAKE_SOURCE_DIR}/src/other/incrTcl/itcl")
-ELSE(MSVC)
- THIRD_PARTY_AUTOCONF_EXTERNAL_PROJECT(IWIDGETS iwidgets
src/other/incrTcl/iwidgets ""
"--with-tcl=${TCL_CONF_PREFIX};--with-tk=${TK_CONF_PREFIX};--with-itcl=${BRLCAD_SOURCE_DIR}/src/other/incrTcl")
-ENDIF(MSVC)
+#THIRD_PARTY_AUTOCONF_EXTERNAL_PROJECT(IWIDGETS iwidgets
src/other/incrTcl/iwidgets ""
"--with-tcl=${TCL_CONF_PREFIX};--with-tk=${TK_CONF_PREFIX};--with-itcl=${BRLCAD_SOURCE_DIR}/src/other/incrTcl")
IF(BRLCAD_BUILD_LOCAL_IWIDGETS)
- ADD_DEPENDENCIES(iwidgets tcl tk itcl itk)
+ ADD_SUBDIRECTORY(incrTcl/iwidgets)
SET(IWIDGETS_VERSION "4.0.1" CACHE STRING "IWIDGETS_VERSION" FORCE)
ELSE(BRLCAD_BUILD_LOCAL_IWIDGETS)
SET(IWIDGETS_VERSION "${IWIDGETS_PACKAGE_VERSION}" CACHE STRING
"IWIDGETS_VERSION" FORCE)
Modified: brlcad/branches/cmake/src/other/incrTcl/iwidgets/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/incrTcl/iwidgets/CMakeLists.txt
2010-10-16 23:08:57 UTC (rev 41019)
+++ brlcad/branches/cmake/src/other/incrTcl/iwidgets/CMakeLists.txt
2010-10-17 00:02:59 UTC (rev 41020)
@@ -1,5 +1,6 @@
SET(IWIDGETS_PKGNAME Iwidgets)
SET(IWIDGETS_PKGVERSION "4.0.1")
+SET(VERSION ${IWIDGETS_PKGVERSION})
SET(IWIDGETS_SCRIPTS
generic/buttonbox.itk
@@ -68,7 +69,7 @@
ENDFOREACH(script ${IWIDGETS_SCRIPTS})
# Create the pkgIndex.tcl file.
-FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl "package ifneeded
${IWIDGETS_PKGNAME} ${IWIDGETS_PKGVERSION} [list load [file join $dir
iwidgets.tcl]]")
+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl "package ifneeded
${IWIDGETS_PKGNAME} ${IWIDGETS_PKGVERSION} [list source [file join $dir
iwidgets.tcl]]")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl DESTINATION
lib/${IWIDGETS_PKGNAME}${IWIDGETS_PKGVERSION})
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/iwidgets.tcl.in
${CMAKE_CURRENT_BINARY_DIR}/iwidgets.tcl)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
