Revision: 42059
http://brlcad.svn.sourceforge.net/brlcad/?rev=42059&view=rev
Author: starseeker
Date: 2011-01-10 17:04:26 +0000 (Mon, 10 Jan 2011)
Log Message:
-----------
Generalize the logic for writing out pkgIndex files
Modified Paths:
--------------
brlcad/branches/cmake/src/other/incrTcl/itcl/CMakeLists.txt
brlcad/branches/cmake/src/other/incrTcl/itk/CMakeLists.txt
brlcad/branches/cmake/src/other/tk/CMakeLists.txt
brlcad/branches/cmake/src/other/tkhtml/CMakeLists.txt
brlcad/branches/cmake/src/other/tkpng/CMakeLists.txt
brlcad/branches/cmake/src/other/tktable/CMakeLists.txt
Modified: brlcad/branches/cmake/src/other/incrTcl/itcl/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/incrTcl/itcl/CMakeLists.txt 2011-01-10
16:11:44 UTC (rev 42058)
+++ brlcad/branches/cmake/src/other/incrTcl/itcl/CMakeLists.txt 2011-01-10
17:04:26 UTC (rev 42059)
@@ -480,10 +480,12 @@
set_target_properties(itcl PROPERTIES INSTALL_RPATH
${CMAKE_INSTALL_PREFIX}/lib/itcl${ITCL_MAJOR_VERSION}.${ITCL_MINOR_VERSION})
set_target_properties(itcl PROPERTIES INSTALL_NAME_DIR
${CMAKE_INSTALL_PREFIX}/lib/itcl${ITCL_MAJOR_VERSION}.${ITCL_MINOR_VERSION})
-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]")
+GET_TARGET_PROPERTY(ITCL_LIBLOCATION itcl LOCATION_${CMAKE_BUILD_TYPE})
+GET_FILENAME_COMPONENT(ITCL_LIBNAME ${ITCL_LIBLOCATION} NAME)
+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl "package ifneeded Itcl
${ITCL_MAJOR_VERSION}.${ITCL_MINOR_VERSION} [list load [file join $dir
${ITCL_LIBNAME}] 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 ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
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} ${ITCL_LIBNAME}] 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 2011-01-10
16:11:44 UTC (rev 42058)
+++ brlcad/branches/cmake/src/other/incrTcl/itk/CMakeLists.txt 2011-01-10
17:04:26 UTC (rev 42059)
@@ -507,10 +507,12 @@
set_target_properties(itk PROPERTIES INSTALL_RPATH
${CMAKE_INSTALL_PREFIX}/lib/itk${ITK_MAJOR_VERSION}.${ITK_MINOR_VERSION})
set_target_properties(itk PROPERTIES INSTALL_NAME_DIR
${CMAKE_INSTALL_PREFIX}/lib/itk${ITK_MAJOR_VERSION}.${ITK_MINOR_VERSION})
-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]")
+GET_TARGET_PROPERTY(ITK_LIBLOCATION itk LOCATION_${CMAKE_BUILD_TYPE})
+GET_FILENAME_COMPONENT(ITK_LIBNAME ${ITK_LIBLOCATION} NAME)
+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl "package ifneeded Itk
${ITK_MAJOR_VERSION}.${ITK_MINOR_VERSION} [list load [file join $dir
${ITK_LIBNAME}] 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 ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
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} ${ITK_LIBNAME}] Itk]")
SET(ITK_LIBRARY_FILES
Modified: brlcad/branches/cmake/src/other/tk/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tk/CMakeLists.txt 2011-01-10 16:11:44 UTC
(rev 42058)
+++ brlcad/branches/cmake/src/other/tk/CMakeLists.txt 2011-01-10 17:04:26 UTC
(rev 42059)
@@ -575,10 +575,12 @@
install(TARGETS tk DESTINATION lib)
SET_TARGET_PROPERTIES(tk PROPERTIES VERSION ${TK_VERSION} SOVERSION
${TK_VERSION_MAJOR}.${TK_VERSION_MINOR})
-FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl "package ifneeded Tk
${TK_VERSION_MAJOR}.${TK_VERSION_MINOR} [list load [file join $dir
libtk${CMAKE_SHARED_LIBRARY_SUFFIX}] Tk]")
+GET_TARGET_PROPERTY(TK_LIBLOCATION tk LOCATION_${CMAKE_BUILD_TYPE})
+GET_FILENAME_COMPONENT(TK_LIBNAME ${TK_LIBLOCATION} NAME)
+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl "package ifneeded Tk
${TK_VERSION_MAJOR}.${TK_VERSION_MINOR} [list load [file join $dir
${TK_LIBNAME}] Tk]")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl DESTINATION
lib/tk${TK_VERSION_MAJOR}.${TK_VERSION_MINOR})
-FILE(WRITE
${CMAKE_BINARY_DIR}/lib/tk${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}/pkgIndex.tcl
"package ifneeded Tk ${TK_VERSION_MAJOR}.${TK_VERSION_MINOR} [list load [file
join $dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
libtk${CMAKE_SHARED_LIBRARY_SUFFIX}] Tk]")
+FILE(WRITE
${CMAKE_BINARY_DIR}/lib/tk${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}/pkgIndex.tcl
"package ifneeded Tk ${TK_VERSION_MAJOR}.${TK_VERSION_MINOR} [list load [file
join $dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ${TK_LIBNAME}] Tk]")
add_library(tkstub STATIC ${TK_STUB_SRCS})
Modified: brlcad/branches/cmake/src/other/tkhtml/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tkhtml/CMakeLists.txt 2011-01-10
16:11:44 UTC (rev 42058)
+++ brlcad/branches/cmake/src/other/tkhtml/CMakeLists.txt 2011-01-10
17:04:26 UTC (rev 42059)
@@ -75,9 +75,14 @@
install(TARGETS Tkhtml DESTINATION lib)
# Create the pkgIndex.tcl file.
-FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl "package ifneeded
${TKHTML_PKGNAME} ${TKHTML_PKGVERSION} [list load [file join $dir ..
libTkhtml${CMAKE_SHARED_LIBRARY_SUFFIX}]]")
+GET_TARGET_PROPERTY(TKHTML_LIBLOCATION Tkhtml LOCATION_${CMAKE_BUILD_TYPE})
+GET_FILENAME_COMPONENT(TKHTML_LIBNAME ${TKHTML_LIBLOCATION} NAME)
+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl "package ifneeded
${TKHTML_PKGNAME} ${TKHTML_PKGVERSION} [list load [file join $dir ..
${TKHTML_LIBNAME}]]")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl DESTINATION
lib/${TKHTML_PKGNAME}${TKHTML_PKGVERSION})
+FILE(WRITE
${CMAKE_BINARY_DIR}/lib/${TKHTML_PKGNAME}${TKHTML_PKGVERSION}/pkgIndex.tcl
"package ifneeded ${TKHTML_PKGNAME} ${TKHTML_PKGVERSION} [list load [file join
$dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ${TKHTML_LIBNAME}] ${TKHTML_PKGNAME}]")
+
+
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tkhtml.n
COMMAND ${TCL_TCLSH_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/doc/macros.tcl -nroff
${CMAKE_CURRENT_SOURCE_DIR}/doc/html.man > ${CMAKE_CURRENT_BINARY_DIR}/tkhtml.n
Modified: brlcad/branches/cmake/src/other/tkpng/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tkpng/CMakeLists.txt 2011-01-10
16:11:44 UTC (rev 42058)
+++ brlcad/branches/cmake/src/other/tkpng/CMakeLists.txt 2011-01-10
17:04:26 UTC (rev 42059)
@@ -20,6 +20,10 @@
install(TARGETS tkpng DESTINATION lib)
# Create the pkgIndex.tcl file.
-FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl "package ifneeded
${TKPNG_PKGNAME} ${TKPNG_PKGVERSION} [list load [file join $dir ..
libtkpng${CMAKE_SHARED_LIBRARY_SUFFIX}] tkpng]")
+GET_TARGET_PROPERTY(TKPNG_LIBLOCATION tkpng LOCATION_${CMAKE_BUILD_TYPE})
+GET_FILENAME_COMPONENT(TKPNG_LIBNAME ${TKPNG_LIBLOCATION} NAME)
+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl "package ifneeded
${TKPNG_PKGNAME} ${TKPNG_PKGVERSION} [list load [file join $dir ..
${TKPNG_LIBNAME}] ${TKPNG_PKGNAME}]")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl DESTINATION
lib/${TKPNG_PKGNAME}${TKPNG_PKGVERSION})
+FILE(WRITE
${CMAKE_BINARY_DIR}/lib/${TKPNG_PKGNAME}${TKPNG_PKGVERSION}/pkgIndex.tcl
"package ifneeded ${TKPNG_PKGNAME} ${TKPNG_PKGVERSION} [list load [file join
$dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ${TKPNG_LIBNAME}] ${TKPNG_PKGNAME}]")
+
Modified: brlcad/branches/cmake/src/other/tktable/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tktable/CMakeLists.txt 2011-01-10
16:11:44 UTC (rev 42058)
+++ brlcad/branches/cmake/src/other/tktable/CMakeLists.txt 2011-01-10
17:04:26 UTC (rev 42059)
@@ -60,8 +60,12 @@
install(TARGETS Tktable DESTINATION lib)
# Create the pkgIndex.tcl file.
-FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl "package ifneeded
${TKTABLE_PKGNAME} ${TKTABLE_PKGVERSION} [list load [file join $dir ..
libTktable${CMAKE_SHARED_LIBRARY_SUFFIX}]]")
+GET_TARGET_PROPERTY(TKTABLE_LIBLOCATION Tktable LOCATION_${CMAKE_BUILD_TYPE})
+GET_FILENAME_COMPONENT(TKTABLE_LIBNAME ${TKTABLE_LIBLOCATION} NAME)
+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl "package ifneeded
${TKTABLE_PKGNAME} ${TKTABLE_PKGVERSION} [list load [file join $dir ..
${TKTABLE_LIBNAME}] ${TKTABLE_PKGNAME}]")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl DESTINATION
lib/${TKTABLE_PKGNAME}${TKTABLE_PKGVERSION})
+FILE(WRITE
${CMAKE_BINARY_DIR}/lib/${TKTABLE_PKGNAME}${TKTABLE_PKGVERSION}/pkgIndex.tcl
"package ifneeded ${TKTABLE_PKGNAME} ${TKTABLE_PKGVERSION} [list load [file
join $dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} ${TKTABLE_LIBNAME}]
${TKTABLE_PKGNAME}]")
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.txt DESTINATION
lib/${TKTABLE_PKGNAME}${TKTABLE_PKGVERSION})
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/license.txt DESTINATION
lib/${TKTABLE_PKGNAME}${TKTABLE_PKGVERSION})
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
