From d2c5549f8e17cf5a2e5939ef6728d9391fca576c Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 1 Jul 2011 14:57:48 +0000 Subject: Cycles: fix crash with image texture nodes (on windows). --- intern/cycles/blender/CMakeLists.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'intern/cycles/blender/CMakeLists.txt') diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt index 50cd8502720..8d7f2b1504b 100644 --- a/intern/cycles/blender/CMakeLists.txt +++ b/intern/cycles/blender/CMakeLists.txt @@ -66,8 +66,11 @@ ADD_DEPENDENCIES(cycles_blender bf_rna) IF(WIN32) TARGET_LINK_LIBRARIES(cycles_blender ${PYTHON_LINKFLAGS}) - TARGET_LINK_LIBRARIES(cycles_blender debug ${PYTHON_LIBRARIES}_d) - TARGET_LINK_LIBRARIES(cycles_blender optimized ${PYTHON_LIBRARIES}) + + FILE_LIST_SUFFIX(PYTHON_LIBRARIES_DEBUG "${PYTHON_LIBRARIES}" "_d") + TARGET_LINK_LIBRARIES_DEBUG(cycles_blender "${PYTHON_LIBRARIES_DEBUG}") + TARGET_LINK_LIBRARIES_OPTIMIZED(cycles_blender "${PYTHON_LIBRARIES}") + UNSET(PYTHON_LIBRARIES_DEBUG) SET_TARGET_PROPERTIES(cycles_blender PROPERTIES PREFIX "lib") SET_TARGET_PROPERTIES(cycles_blender PROPERTIES SUFFIX ".pyd") @@ -82,8 +85,7 @@ INSTALL(TARGETS cycles_blender LIBRARY DESTINATION ${CYCLES_INSTALL_PATH}/cycles IF(WIN32) FILE(GLOB OIIO_DLLS "${CYCLES_OIIO}/bin/*.dll") - FILE(GLOB BOOST_DLLS "${CYCLES_BOOST}/lib/*.dll") - INSTALL(FILES ${OIIO_DLLS} ${BOOST_DLLS} + INSTALL(FILES ${OIIO_DLLS} DESTINATION ${CYCLES_INSTALL_PATH}/cycles) ENDIF() -- cgit v1.2.3