diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-06-30 18:47:57 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-06-30 18:47:57 +0400 |
| commit | 4ff22bd097e979e07622793d1f44d7419fb73efd (patch) | |
| tree | 8eae37d4244146d2ce9e9d82567a358176cfda77 /intern/cycles/blender/CMakeLists.txt | |
| parent | b57c87856d6d27f9829d47f0895ab4f86b1c865f (diff) | |
Cycles: OS X build system changes to use lib/ openimageio and boost.
Diffstat (limited to 'intern/cycles/blender/CMakeLists.txt')
| -rw-r--r-- | intern/cycles/blender/CMakeLists.txt | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt index 013c671468e..50cd8502720 100644 --- a/intern/cycles/blender/CMakeLists.txt +++ b/intern/cycles/blender/CMakeLists.txt @@ -87,7 +87,7 @@ IF(WIN32) DESTINATION ${CYCLES_INSTALL_PATH}/cycles) ENDIF() -IF(UNIX) +IF(UNIX AND NOT APPLE) # copy libraries to cycles lib directory SET(install_libs ${OPENIMAGEIO_LIBRARY} @@ -101,27 +101,7 @@ IF(UNIX) 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) - " - ) - ELSE() - ENDIF() + # set path to look for dynamic libs + SET_TARGET_PROPERTIES(cycles_blender PROPERTIES INSTALL_RPATH $ORIGIN/lib) ENDIF() - |