griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: for mac and unix, copy oiio/boost dynamic libraries into cycles lib

Browse Source 
directory to avoid library path issues.
This commit is contained in:
Brecht Van Lommel
2011-06-28 13:44:47 +00:00
parent 27a99869aa
commit bdb92dab74
1 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
intern/cycles/blender/CMakeLists.txt
View File

@@ -78,11 +78,7 @@ TARGET_LINK_LIBRARIES(cycles_blender ${LIBRARIES})
INSTALL(FILES ${addonfiles} DESTINATION ${CYCLES_INSTALL_PATH}/cycles)
INSTALL(TARGETS cycles_blender LIBRARY DESTINATION ${CYCLES_INSTALL_PATH}/cycles)
IF(UNIX AND NOT APPLE)
SET_TARGET_PROPERTIES(cycles_blender PROPERTIES INSTALL_RPATH $ORIGIN/lib)
ENDIF()
# Install DLL's
# Install Dynamic Libraries
IF(WIN32)
FILE(GLOB OIIO_DLLS "${CYCLES_OIIO}/bin/*.dll")
@@ -91,4 +87,39 @@ IF(WIN32)
DESTINATION ${CYCLES_INSTALL_PATH}/cycles)
ENDIF()
IF(UNIX)
# copy libraries to cycles lib directory
SET(install_libs
${OPENIMAGEIO_LIBRARY}
${Boost_LIBRARIES}
${OSL_LIBRARIES}
${PARTIO_LIBRARIES})
INSTALL(FILES ${install_libs}
DESTINATION ${CYCLES_INSTALL_PATH}/cycles/lib)
IF(NOT APPLE)
# set path to look for dynamic libs
SET_TARGET_PROPERTIES(cycles_blender PROPERTIES INSTALL_RPATH $ORIGIN/lib)
ELSE()
# modify our libs to looks for dynamic libs in cycles lib directory
SET(install_name_command "install_name_tool")
FOREACH(lib ${install_libs})
GET_FILENAME_COMPONENT(libname ${lib} NAME)
SET(install_name_command " ${install_name_command} -change ${lib} @loader_path/lib/${libname}")
SET(install_name_command " ${install_name_command} -change ${libname} @loader_path/lib/${libname}")
ENDFOREACH()
INSTALL(
CODE
"
EXECUTE_PROCESS(COMMAND ${install_name_command} ${CYCLES_INSTALL_PATH}/cycles/libcycles_blender.so)
EXECUTE_PROCESS(COMMAND echo ${install_name_command} ${CYCLES_INSTALL_PATH}/cycles/libcycles_blender.so)
"
)
ELSE()
ENDIF()
ENDIF()