blender
/
blender
136
418
Fork 600
Code Issues 6.3k Pull Requests 780 Projects 19 Wiki Activity

OSX/cmake: fix a recently reported dependency issue

This commit is contained in:
jens verwiebe 2014-04-13 18:04:35 +02:00
parent 6f153046e0
commit 6e9c2d0c55
Notes: blender-bot 2023-02-14 10:48:29 +01:00 
Referenced by issue #40359, Scene / Color Management: White Point Mapping Has Limit
Referenced by issue #39717, Texture is not refreshed in Deform
Referenced by issue #39734, Bevel tool - Inner Edge loops are not beveled
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -1811,7 +1811,6 @@ elseif(APPLE)
set(BOOST_LIBRARIES boost_date_time-mt boost_filesystem-mt boost_regex-mt boost_system-mt boost_thread-mt boost_wave-mt)
if(WITH_INTERNATIONAL)
list(APPEND BOOST_LIBRARIES boost_locale-mt)
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -liconv") # boost_locale needs it !
endif()
if(WITH_CYCLES_NETWORK)
list(APPEND BOOST_LIBRARIES boost_serialization-mt)
@ -1819,6 +1818,10 @@ elseif(APPLE)
set(BOOST_LIBPATH ${BOOST}/lib)
set(BOOST_DEFINITIONS)
endif()
if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG)
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -liconv") # boost_locale and ffmpeg needs it !
endif()
if(WITH_OPENIMAGEIO)
set(OPENIMAGEIO ${LIBDIR}/openimageio)