[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50889] trunk/blender: Boost directories were not properly configured to vc2010.

[Alexander Pinzon]

Revision: 50889
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50889
Author:   apinzonf
Date:     2012-09-25 15:11:34 +0000 (Tue, 25 Sep 2012)
Log Message:
-----------
Boost directories were not properly configured to vc2010.
Opencolorio directories and openimageio not work as you would expect macro

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/source/creator/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2012-09-25 13:31:46 UTC (rev 50888)
+++ trunk/blender/CMakeLists.txt	2012-09-25 15:11:34 UTC (rev 50889)
@@ -1073,7 +1073,7 @@
 			set(BOOST ${LIBDIR}/boost)
 			set(BOOST_INCLUDE_DIR ${BOOST}/include)
 			if(MSVC10)
-				set(BOOST_LIBPATH ${BOOST}/vc2010/lib)
+				set(BOOST_LIBPATH ${BOOST}/lib/vc_10)
 				set(BOOST_POSTFIX "vc100-mt-s-1_49.lib")
 				set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_49.lib")
 			else()
@@ -1109,7 +1109,7 @@
 			set(OPENCOLORIO ${LIBDIR}/opencolorio)
 			set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
 			set(OPENCOLORIO_LIBRARIES OpenColorIO)
-			set_lib_path(OPENCOLORIO_LIBPATH "opencolorio/lib")
+			set(OPENCOLORIO_LIBPATH ${LIBDIR}/opencolorio/lib)
 			set(OPENCOLORIO_DEFINITIONS)
 		endif()
 

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2012-09-25 13:31:46 UTC (rev 50888)
+++ trunk/blender/source/creator/CMakeLists.txt	2012-09-25 15:11:34 UTC (rev 50889)
@@ -636,7 +636,7 @@
 
 	if(WITH_OPENIMAGEIO)
 		if(NOT MINGW)
-			set_lib_path(OIIOBIN "openimageio")
+			set(OIIOBIN ${LIBDIR}/openimageio)
 			install(
 				FILES
 					${OIIOBIN}/bin/OpenImageIO.dll
@@ -646,7 +646,7 @@
 	endif()
 
 	if(WITH_OPENCOLORIO)
-		set_lib_path(OCIOBIN "opencolorio/bin")
+		set(OCIOBIN ${LIBDIR}/opencolorio/bin)
 		if(NOT MINGW)
 			install(
 				FILES