diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2014-04-13 20:04:35 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-04-13 20:04:56 +0400 |
| commit | 6e9c2d0c5559f1f6077787f932c648fb6ca7a13e (patch) | |
| tree | 6524474ad5d5706ed1de057ce2c4ea7dc9a7ac30 | |
| parent | 6f153046e0ffec912883ab24b9fda823e9fbeb38 (diff) | |
OSX/cmake: fix a recently reported dependency issue
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 97cacfa6f3c..ccdc2426c22 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) |