svn merge -r 16060:16222 https://svn.blender.org/svnroot/bf-blender/trunk/blender

[blender-staging.git] / CMake / macros.cmake

diff --git a/CMake/macros.cmake b/CMake/macros.cmake
index d669ce14b282be6a311690bc6930884896401a36..6b6837d25f0526667e29a74f7552f814335cdd95 100644 (file)
--- a/CMake/macros.cmake
+++ b/CMake/macros.cmake
@@ -34,11 +34,11 @@ MACRO(BLENDERLIB
   BLENDERLIB_NOLIST(${name} "${sources}" "${includes}")
 
   # Add to blender's list of libraries
-  FILE(APPEND ${CMAKE_SOURCE_DIR}/cmake_blender_libs.txt "${name};")
+  FILE(APPEND ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt "${name};")
 ENDMACRO(BLENDERLIB)
 
 MACRO(SETUP_LIBDIRS)
-  LINK_DIRECTORIES(${PYTHON_LIBPATH} ${SDL_LIBPATH} ${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${ICONV_LIBPATH} ${OPENEXR_LIBPATH} ${FFMPEG_LIBPATH})
+  LINK_DIRECTORIES(${PYTHON_LIBPATH} ${SDL_LIBPATH} ${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${ICONV_LIBPATH} ${OPENEXR_LIBPATH} ${QUICKTIME_LIBPATH} ${FFMPEG_LIBPATH})
   IF(WITH_INTERNATIONAL)
     LINK_DIRECTORIES(${GETTEXT_LIBPATH})
     LINK_DIRECTORIES(${FREETYPE_LIBPATH})
@@ -66,6 +66,9 @@ MACRO(SETUP_LIBLINKS
   IF(WIN32)
     TARGET_LINK_LIBRARIES(${target} ${ICONV_LIB})
   ENDIF(WIN32)
+  IF(WITH_QUICKTIME)
+    TARGET_LINK_LIBRARIES(${target} ${QUICKTIME_LIB})
+  ENDIF(WITH_QUICKTIME)
   IF(WITH_OPENEXR)
     TARGET_LINK_LIBRARIES(${target} ${OPENEXR_LIB})
   ENDIF(WITH_OPENEXR)