Localization should not depend on debug locale library

Linking happens fine, but blender crashes on startup -- crash with familiar
backtrace happens with i18n disabled (in that case it's something to do with OIIO).

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 34182556b4af322540b0959fc75cf03f8305ebf9..a411a4f69e64fbb743c5f67eb7461677fdd12161 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1108,8 +1108,8 @@ elseif(WIN32)
                                #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}
-                                       optimized libboost_locale-${BOOST_POSTFIX})
+                               set(BOOST_LIBRARIES ${BOOST_LIBRARIES} libboost_locale-${BOOST_POSTFIX})
+                                       #optimized libboost_locale-${BOOST_POSTFIX})
                                        #debug libboost_locale-${BOOST_DEBUG_POSTFIX}
                        endif(WITH_INTERNATIONAL)
                        set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")

diff --git a/intern/locale/CMakeLists.txt b/intern/locale/CMakeLists.txt
index f3356bcda4997f56f6daec53bbe43a0f4aaadc3e..3187639c844b0837f974324b55f752a5cafde669 100644 (file)
--- a/intern/locale/CMakeLists.txt
+++ b/intern/locale/CMakeLists.txt
@@ -39,6 +39,7 @@ if(WITH_INTERNATIONAL)
                ${BOOST_INCLUDE_DIR}
        )
        add_definitions(-DWITH_INTERNATIONAL)
+       add_definitions(${BOOST_DEFINITIONS})
 endif()
 
 blender_add_lib(bf_intern_locale "${SRC}" "${INC}" "${INC_SYS}")