[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52371] trunk/blender/CMakeLists.txt: Bring back debug boost libs to cmake.

[Sergey Sharybin]

Revision: 52371
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52371
Author:   nazgul
Date:     2012-11-19 18:07:55 +0000 (Mon, 19 Nov 2012)
Log Message:
-----------
Bring back debug boost libs to cmake. Also use debug version of OIIO for debug builds.

SO now blender could be debugged on windows again!

There'll likely be compilation error of debug version of blender using msvc2010, not
currently sure how to solve that in a good way.

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

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2012-11-19 17:47:16 UTC (rev 52370)
+++ trunk/blender/CMakeLists.txt	2012-11-19 18:07:55 UTC (rev 52371)
@@ -1089,23 +1089,23 @@
 			if(MSVC10)
 				set(BOOST_LIBPATH ${BOOST}/vc2010/lib)
 				set(BOOST_POSTFIX "vc100-mt-s-1_49.lib")
-				#set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_49.lib")
+				set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_49.lib")
 			else()
 				set(BOOST_LIBPATH ${BOOST}/lib)
 				set(BOOST_POSTFIX "vc90-mt-s-1_49.lib")
-				#set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_49.lib")
+				set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_49.lib")
 			endif()
 			set(BOOST_LIBRARIES
 				optimized libboost_date_time-${BOOST_POSTFIX} optimized libboost_filesystem-${BOOST_POSTFIX}
 				optimized libboost_regex-${BOOST_POSTFIX}
-				optimized libboost_system-${BOOST_POSTFIX} optimized libboost_thread-${BOOST_POSTFIX})
-				#debug libboost_date_time-${BOOST_DEBUG_POSTFIX} debug libboost_filesystem-${BOOST_DEBUG_POSTFIX}
-				#debug libboost_regex-${BOOST_DEBUG_POSTFIX}
-				#debug libboost_system-${BOOST_DEBUG_POSTFIX} debug libboost_thread-${BOOST_DEBUG_POSTFIX}
+				optimized libboost_system-${BOOST_POSTFIX} optimized libboost_thread-${BOOST_POSTFIX}
+				debug libboost_date_time-${BOOST_DEBUG_POSTFIX} debug libboost_filesystem-${BOOST_DEBUG_POSTFIX}
+				debug libboost_regex-${BOOST_DEBUG_POSTFIX}
+				debug libboost_system-${BOOST_DEBUG_POSTFIX} debug libboost_thread-${BOOST_DEBUG_POSTFIX})
 			if(WITH_INTERNATIONAL)
-				set(BOOST_LIBRARIES ${BOOST_LIBRARIES} libboost_locale-${BOOST_POSTFIX})
-					#optimized libboost_locale-${BOOST_POSTFIX})
-					#debug libboost_locale-${BOOST_DEBUG_POSTFIX}
+				set(BOOST_LIBRARIES ${BOOST_LIBRARIES}
+					optimized libboost_locale-${BOOST_POSTFIX}
+					debug libboost_locale-${BOOST_DEBUG_POSTFIX})
 			endif(WITH_INTERNATIONAL)
 			set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
 		endif()
@@ -1113,7 +1113,7 @@
 		if(WITH_OPENIMAGEIO)
 			set(OPENIMAGEIO ${LIBDIR}/openimageio)
 			set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
-			set(OPENIMAGEIO_LIBRARIES OpenImageIO)
+			set(OPENIMAGEIO_LIBRARIES optimized OpenImageIO debug OpenImageIO_d)
 			set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
 			set(OPENIMAGEIO_DEFINITIONS "-DUSE_TBB=0")
 		endif()