[Bf-blender-cvs] [6e9c2d0] master: OSX/cmake: fix a recently reported dependency issue

Jens Verwiebe noreply at git.blender.org
Sun Apr 13 18:05:03 CEST 2014


Commit: 6e9c2d0c5559f1f6077787f932c648fb6ca7a13e
Author: Jens Verwiebe
Date:   Sun Apr 13 18:04:35 2014 +0200
https://developer.blender.org/rB6e9c2d0c5559f1f6077787f932c648fb6ca7a13e

OSX/cmake: fix a recently reported dependency issue

===================================================================

M	CMakeLists.txt

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97cacfa..ccdc242 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)




More information about the Bf-blender-cvs mailing list