Revision: 41737
          http://brlcad.svn.sourceforge.net/brlcad/?rev=41737&view=rev
Author:   starseeker
Date:     2010-12-21 14:49:26 +0000 (Tue, 21 Dec 2010)

Log Message:
-----------
Start with itcl/itk - try tweaking the build directory pkgIndex.tcl to use 
CMAKE_LIBRARY_OUTPUT_DIRECTORY.

Modified Paths:
--------------
    brlcad/branches/cmake/src/other/incrTcl/itcl/CMakeLists.txt
    brlcad/branches/cmake/src/other/incrTcl/itk/CMakeLists.txt

Modified: brlcad/branches/cmake/src/other/incrTcl/itcl/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/incrTcl/itcl/CMakeLists.txt 2010-12-21 
14:26:37 UTC (rev 41736)
+++ brlcad/branches/cmake/src/other/incrTcl/itcl/CMakeLists.txt 2010-12-21 
14:49:26 UTC (rev 41737)
@@ -482,7 +482,7 @@
 FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl "package ifneeded Itcl 
${ITCL_MAJOR_VERSION}.${ITCL_MINOR_VERSION} [list load [file join $dir 
libitcl${CMAKE_SHARED_LIBRARY_SUFFIX}] Itcl]")
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl DESTINATION 
lib/itcl${ITCL_MAJOR_VERSION}.${ITCL_MINOR_VERSION})
 
-FILE(WRITE 
${CMAKE_BINARY_DIR}/lib/itcl${ITCL_MAJOR_VERSION}.${ITCL_MINOR_VERSION}/pkgIndex.tcl
 "package ifneeded Itcl ${ITCL_MAJOR_VERSION}.${ITCL_MINOR_VERSION} [list load 
[file join $dir .. libitcl${CMAKE_SHARED_LIBRARY_SUFFIX}] Itcl]")
+FILE(WRITE 
${CMAKE_BINARY_DIR}/lib/itcl${ITCL_MAJOR_VERSION}.${ITCL_MINOR_VERSION}/pkgIndex.tcl
 "package ifneeded Itcl ${ITCL_MAJOR_VERSION}.${ITCL_MINOR_VERSION} [list load 
[file join $dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} 
libitcl${CMAKE_SHARED_LIBRARY_SUFFIX}] Itcl]")
 
 install(FILES library/itcl.tcl DESTINATION 
lib/itcl${ITCL_MAJOR_VERSION}.${ITCL_MINOR_VERSION})
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/library/itcl.tcl 
${CMAKE_BINARY_DIR}/lib/itcl${ITCL_MAJOR_VERSION}.${ITCL_MINOR_VERSION}/itcl.tcl
 COPYONLY)

Modified: brlcad/branches/cmake/src/other/incrTcl/itk/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/incrTcl/itk/CMakeLists.txt  2010-12-21 
14:26:37 UTC (rev 41736)
+++ brlcad/branches/cmake/src/other/incrTcl/itk/CMakeLists.txt  2010-12-21 
14:49:26 UTC (rev 41737)
@@ -509,7 +509,7 @@
 FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl "package ifneeded Itk 
${ITK_MAJOR_VERSION}.${ITK_MINOR_VERSION} [list load [file join $dir 
libitk${CMAKE_SHARED_LIBRARY_SUFFIX}] Itk]")
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl DESTINATION 
lib/itk${ITK_MAJOR_VERSION}.${ITK_MINOR_VERSION})
 
-FILE(WRITE 
${CMAKE_BINARY_DIR}/lib/itk${ITK_MAJOR_VERSION}.${ITK_MINOR_VERSION}/pkgIndex.tcl
 "package ifneeded Itk ${ITK_MAJOR_VERSION}.${ITK_MINOR_VERSION} [list load 
[file join $dir .. libitk${CMAKE_SHARED_LIBRARY_SUFFIX}] Itk]")
+FILE(WRITE 
${CMAKE_BINARY_DIR}/lib/itk${ITK_MAJOR_VERSION}.${ITK_MINOR_VERSION}/pkgIndex.tcl
 "package ifneeded Itk ${ITK_MAJOR_VERSION}.${ITK_MINOR_VERSION} [list load 
[file join $dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} 
libitk${CMAKE_SHARED_LIBRARY_SUFFIX}] Itk]")
 
 
 SET(ITK_LIBRARY_FILES


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
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits

Reply via email to