Bring back debug boost libs to cmake. Also use debug version of OIIO for debug builds.
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 19 Nov 2012 18:07:55 +0000 (18:07 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 19 Nov 2012 18:07:55 +0000 (18:07 +0000)
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.

CMakeLists.txt

index 760b5ba49cccff104b4a2baa1460c48f60e6c13b..dec83d617abdfc5afbf3fd3ad97a4203aed46176 100644 (file)
@@ -1089,23 +1089,23 @@ elseif(WIN32)
                        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 @@ elseif(WIN32)
                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()