Revision: 41542
http://brlcad.svn.sourceforge.net/brlcad/?rev=41542&view=rev
Author: starseeker
Date: 2010-12-07 20:08:41 +0000 (Tue, 07 Dec 2010)
Log Message:
-----------
Since we are putting library files in subdirectories, we need to tell RPATH
about it
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-07
19:54:26 UTC (rev 41541)
+++ brlcad/branches/cmake/src/other/incrTcl/itcl/CMakeLists.txt 2010-12-07
20:08:41 UTC (rev 41542)
@@ -465,6 +465,8 @@
add_library(itcl ${ITCL_GENERIC_SRCS})
target_link_libraries(itcl ${M_LIBRARY} ${TCL_LIBRARY})
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})
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})
Modified: brlcad/branches/cmake/src/other/incrTcl/itk/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/incrTcl/itk/CMakeLists.txt 2010-12-07
19:54:26 UTC (rev 41541)
+++ brlcad/branches/cmake/src/other/incrTcl/itk/CMakeLists.txt 2010-12-07
20:08:41 UTC (rev 41542)
@@ -494,6 +494,8 @@
add_library(itk ${ITK_GENERIC_SRCS})
target_link_libraries(itk ${M_LIBRARY} ${TCL_LIBRARY} ${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})
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})
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
What happens now with your Lotus Notes apps - do you make another costly
upgrade, or settle for being marooned without product support? Time to move
off Lotus Notes and onto the cloud with Force.com, apps are easier to build,
use, and manage than apps on traditional platforms. Sign up for the Lotus
Notes Migration Kit to learn more. http://p.sf.net/sfu/salesforce-d2d
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
