Revision: 42420
http://brlcad.svn.sourceforge.net/brlcad/?rev=42420&view=rev
Author: starseeker
Date: 2011-01-18 21:16:02 +0000 (Tue, 18 Jan 2011)
Log Message:
-----------
Fix/generalize pkgIndex.tcl logic, make incrTcl libs follow convention.
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-18
20:58:39 UTC (rev 42419)
+++ brlcad/branches/cmake/src/other/incrTcl/itcl/CMakeLists.txt 2011-01-18
21:16:02 UTC (rev 42420)
@@ -472,13 +472,11 @@
add_library(itcl ${ITCL_GENERIC_SRCS})
SET_TARGET_PROPERTIES(itcl PROPERTIES PREFIX "lib")
target_link_libraries(itcl ${M_LIBRARY} ${TCL_LIBRARY} ${TCL_STUB_LIBRARIES})
-install(TARGETS itcl DESTINATION
lib/itcl${ITCL_MAJOR_VERSION}.${ITCL_MINOR_VERSION})
-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})
+install(TARGETS itcl DESTINATION ${LIB_DIR})
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]")
+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl "package ifneeded Itcl
${ITCL_MAJOR_VERSION}.${ITCL_MINOR_VERSION} [list load [file join $dir .. ..
${LIB_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} ${ITCL_LIBNAME}] Itcl]")
Modified: brlcad/branches/cmake/src/other/incrTcl/itk/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/incrTcl/itk/CMakeLists.txt 2011-01-18
20:58:39 UTC (rev 42419)
+++ brlcad/branches/cmake/src/other/incrTcl/itk/CMakeLists.txt 2011-01-18
21:16:02 UTC (rev 42420)
@@ -499,13 +499,11 @@
add_library(itk ${ITK_GENERIC_SRCS})
SET_TARGET_PROPERTIES(itk PROPERTIES PREFIX "lib")
target_link_libraries(itk ${M_LIBRARY} ${TCL_LIBRARY} ${TCL_TK_LIBRARY}
${ITCL_LIBRARY})
-install(TARGETS itk DESTINATION
lib/itk${ITK_MAJOR_VERSION}.${ITK_MINOR_VERSION})
-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})
+install(TARGETS itk DESTINATION ${LIB_DIR})
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]")
+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl "package ifneeded Itk
${ITK_MAJOR_VERSION}.${ITK_MINOR_VERSION} [list load [file join $dir .. ..
${LIB_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} ${ITK_LIBNAME}] Itk]")
Modified: brlcad/branches/cmake/src/other/tk/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tk/CMakeLists.txt 2011-01-18 20:58:39 UTC
(rev 42419)
+++ brlcad/branches/cmake/src/other/tk/CMakeLists.txt 2011-01-18 21:16:02 UTC
(rev 42420)
@@ -575,7 +575,7 @@
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]")
+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl "package ifneeded Tk
${TK_VERSION_MAJOR}.${TK_VERSION_MINOR} [list load [file join $dir .. ..
${LIB_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} ${TK_LIBNAME}] Tk]")
Modified: brlcad/branches/cmake/src/other/tkhtml/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tkhtml/CMakeLists.txt 2011-01-18
20:58:39 UTC (rev 42419)
+++ brlcad/branches/cmake/src/other/tkhtml/CMakeLists.txt 2011-01-18
21:16:02 UTC (rev 42420)
@@ -80,7 +80,7 @@
# Create the pkgIndex.tcl file.
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}]]")
+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl "package ifneeded
${TKHTML_PKGNAME} ${TKHTML_PKGVERSION} [list load [file join $dir .. ..
${LIB_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}]")
Modified: brlcad/branches/cmake/src/other/tkpng/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tkpng/CMakeLists.txt 2011-01-18
20:58:39 UTC (rev 42419)
+++ brlcad/branches/cmake/src/other/tkpng/CMakeLists.txt 2011-01-18
21:16:02 UTC (rev 42420)
@@ -22,7 +22,7 @@
# Create the pkgIndex.tcl file.
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}]")
+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl "package ifneeded
${TKPNG_PKGNAME} ${TKPNG_PKGVERSION} [list load [file join $dir .. ..
${LIB_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-18
20:58:39 UTC (rev 42419)
+++ brlcad/branches/cmake/src/other/tktable/CMakeLists.txt 2011-01-18
21:16:02 UTC (rev 42420)
@@ -66,7 +66,7 @@
# Create the pkgIndex.tcl file.
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}]")
+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl "package ifneeded
${TKTABLE_PKGNAME} ${TKTABLE_PKGVERSION} [list load [file join $dir .. ..
${LIB_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}]")
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
