diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-10-11 16:17:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-10-11 16:22:54 +0400 |
| commit | 54ee22130ca0ce59500c6eddb562b78eb4526bcd (patch) | |
| tree | ba21cdaa35656c590059c864e028e24b6e234082 /intern/locale/CMakeLists.txt | |
| parent | b09f7dcaa7b487ada53c8dbaa811deaa1201d163 (diff) | |
| parent | 04814476c08e9350c424619cd99ccb1149d65365 (diff) | |
Merge branch 'master' into dyntopo_holesdyntopo_holes
Conflicts:
source/blender/blenkernel/intern/pbvh_bmesh.c
Diffstat (limited to 'intern/locale/CMakeLists.txt')
| -rw-r--r-- | intern/locale/CMakeLists.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/intern/locale/CMakeLists.txt b/intern/locale/CMakeLists.txt index 217fe9a8c71..5d70c449234 100644 --- a/intern/locale/CMakeLists.txt +++ b/intern/locale/CMakeLists.txt @@ -36,6 +36,11 @@ set(SRC boost_locale_wrapper.h ) +if(APPLE) + # Cocoa code to read the locale on OSX + list(APPEND SRC osx_user_locale.mm) +endif() + if(WITH_HEADLESS) add_definitions(-DWITH_HEADLESS) endif() |