Revision: 41266
http://brlcad.svn.sourceforge.net/brlcad/?rev=41266&view=rev
Author: starseeker
Date: 2010-11-06 14:09:36 +0000 (Sat, 06 Nov 2010)
Log Message:
-----------
We apparently require Itk 3.4? Not quite sure where that is coming from, need
to check - for now, fake it.
Modified Paths:
--------------
brlcad/branches/cmake/src/other/incrTcl/itk/CMakeLists.txt
brlcad/branches/cmake/src/other/incrTcl/itk/generic/itk.h
brlcad/branches/cmake/src/other/incrTcl/iwidgets/CMakeLists.txt
Modified: brlcad/branches/cmake/src/other/incrTcl/itk/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/incrTcl/itk/CMakeLists.txt 2010-11-06
13:33:11 UTC (rev 41265)
+++ brlcad/branches/cmake/src/other/incrTcl/itk/CMakeLists.txt 2010-11-06
14:09:36 UTC (rev 41266)
@@ -58,7 +58,7 @@
# version numbers
SET(ITK_MAJOR_VERSION 3)
-SET(ITK_MINOR_VERSION 3)
+SET(ITK_MINOR_VERSION 4)
SET(ITK_VERSION "${ITK_MAJOR_VERSION}.${ITK_MINOR_VERSION}")
Modified: brlcad/branches/cmake/src/other/incrTcl/itk/generic/itk.h
===================================================================
--- brlcad/branches/cmake/src/other/incrTcl/itk/generic/itk.h 2010-11-06
13:33:11 UTC (rev 41265)
+++ brlcad/branches/cmake/src/other/incrTcl/itk/generic/itk.h 2010-11-06
14:09:36 UTC (rev 41266)
@@ -60,12 +60,12 @@
#define ITK_MAJOR_VERSION 3
-#define ITK_MINOR_VERSION 3
+#define ITK_MINOR_VERSION 4
#define ITK_RELEASE_LEVEL TCL_FINAL_RELEASE
#define ITK_RELEASE_SERIAL 0
-#define ITK_VERSION "3.3"
-#define ITK_PATCH_LEVEL "3.3.0"
+#define ITK_VERSION "3.4"
+#define ITK_PATCH_LEVEL "3.4.0"
/*
Modified: brlcad/branches/cmake/src/other/incrTcl/iwidgets/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/incrTcl/iwidgets/CMakeLists.txt
2010-11-06 13:33:11 UTC (rev 41265)
+++ brlcad/branches/cmake/src/other/incrTcl/iwidgets/CMakeLists.txt
2010-11-06 14:09:36 UTC (rev 41266)
@@ -68,11 +68,18 @@
install(FILES ${script} DESTINATION
lib/${IWIDGETS_PKGNAME}${IWIDGETS_PKGVERSION}/scripts)
ENDFOREACH(script ${IWIDGETS_SCRIPTS})
+FOREACH(file ${IWIDGETS_SCRIPTS})
+ get_filename_component(filename ${file} NAME)
+ configure_file(${file}
+
${CMAKE_BINARY_DIR}/lib/${IWIDGETS_PKGNAME}${IWIDGETS_PKGVERSION}/scripts/${filename}
COPYONLY)
+ENDFOREACH(file ${ITK_LIBRARY_FILES})
+
# Create the pkgIndex.tcl file.
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_BINARY_DIR}/pkgIndex.tcl
${CMAKE_BINARY_DIR}/lib/${IWIDGETS_PKGNAME}${IWIDGETS_PKGVERSION}/pkgIndex.tcl
COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/iwidgets.tcl.in
${CMAKE_CURRENT_BINARY_DIR}/iwidgets.tcl)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iwidgets.tcl DESTINATION
lib/${IWIDGETS_PKGNAME}${IWIDGETS_PKGVERSION})
+configure_file(${CMAKE_CURRENT_BINARY_DIR}/iwidgets.tcl
${CMAKE_BINARY_DIR}/lib/${IWIDGETS_PKGNAME}${IWIDGETS_PKGVERSION}/iwidgets.tcl
COPYONLY)
install(FILES license.terms DESTINATION
lib/${IWIDGETS_PKGNAME}${IWIDGETS_PKGVERSION})
-install(FILES license.terms DESTINATION
lib/${IWIDGETS_PKGNAME}${IWIDGETS_PKGVERSION})
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The Next 800 Companies to Lead America's Growth: New Video Whitepaper
David G. Thomson, author of the best-selling book "Blueprint to a
Billion" shares his insights and actions to help propel your
business during the next growth cycle. Listen Now!
http://p.sf.net/sfu/SAP-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
