[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39672] branches/cycles/source/creator/ CMakeLists.txt: Cycles: remove automatic copy of boost/ openimageio shared libraries to binary

Brecht Van Lommel brechtvanlommel at pandora.be
Wed Aug 24 15:43:35 CEST 2011


Revision: 39672
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39672
Author:   blendix
Date:     2011-08-24 13:43:34 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
Cycles: remove automatic copy of boost/openimageio shared libraries to binary
folder, this doesn't work well, proper solution is to statically link these in
official builds.

Modified Paths:
--------------
    branches/cycles/source/creator/CMakeLists.txt

Modified: branches/cycles/source/creator/CMakeLists.txt
===================================================================
--- branches/cycles/source/creator/CMakeLists.txt	2011-08-24 10:44:04 UTC (rev 39671)
+++ branches/cycles/source/creator/CMakeLists.txt	2011-08-24 13:43:34 UTC (rev 39672)
@@ -405,22 +405,6 @@
 			# install(CODE "execute_process(COMMAND find ${TARGETDIR}/${BLENDER_VERSION}/python/lib/ -name '*.so' -exec strip -s {} '\;')")
 		endif()
 	endif()
-
-	# XXX this is non standard
-	if(WITH_OPENIMAGEIO)
-		set(oiio_install_libs
-			${OPENIMAGEIO_LIBPATH}/lib${OPENIMAGEIO_LIBRARY}.so
-			${BOOST_LIBRARIES})
-
-		list(REMOVE_ITEM oiio_install_libs optimized)
-		list(REMOVE_ITEM oiio_install_libs debug)
-
-		install(
-			FILES ${oiio_install_libs}
-			DESTINATION ${TARGETDIR}
-		)
-	endif()
-
 elseif(WIN32)
 
 	set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION})




More information about the Bf-blender-cvs mailing list