From 4ff22bd097e979e07622793d1f44d7419fb73efd Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Thu, 30 Jun 2011 14:47:57 +0000
Subject: Cycles: OS X build system changes to use lib/ openimageio and boost.

---
 intern/cycles/blender/CMakeLists.txt | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

(limited to 'intern/cycles/blender/CMakeLists.txt')

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()
 
-
-- 
cgit v1.2.3