[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52355] trunk/blender: Localization should not depend on debug locale library

[Sergey Sharybin]

Revision: 52355
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52355
Author:   nazgul
Date:     2012-11-19 13:15:11 +0000 (Mon, 19 Nov 2012)
Log Message:
-----------
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).

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

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2012-11-19 11:46:55 UTC (rev 52354)
+++ trunk/blender/CMakeLists.txt	2012-11-19 13:15:11 UTC (rev 52355)
@@ -1108,8 +1108,8 @@
 				#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")

Modified: trunk/blender/intern/locale/CMakeLists.txt
===================================================================
--- trunk/blender/intern/locale/CMakeLists.txt	2012-11-19 11:46:55 UTC (rev 52354)
+++ trunk/blender/intern/locale/CMakeLists.txt	2012-11-19 13:15:11 UTC (rev 52355)
@@ -39,6 +39,7 @@
 		${BOOST_INCLUDE_DIR}
 	)
 	add_definitions(-DWITH_INTERNATIONAL)
+	add_definitions(${BOOST_DEFINITIONS})
 endif()
 
 blender_add_lib(bf_intern_locale "${SRC}" "${INC}" "${INC_SYS}")