diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-11-19 17:15:11 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-11-19 17:15:11 +0400 |
commit | 9947f70f19a333b4dba6ed57ae22d93fa0f89145 (patch) | |
tree | 74c3e06c16b3fe331e9ed059300b93dc275ad7d3 | |
parent | 3b570440e4c104e01e4937e1be55df5003707ab1 (diff) |
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).
-rw-r--r-- | CMakeLists.txt | 4 | ||||
-rw-r--r-- | intern/locale/CMakeLists.txt | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 34182556b4a..a411a4f69e6 100644 --- 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 f3356bcda49..3187639c844 100644 --- 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}") |