Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-06-15 17:54:57 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-06-15 17:54:57 +0400
commitc02121b7080533c73625180ad850d145ba639378 (patch)
tree4ca959fa74f57167bfa1d0a2097693f78c092e59 /build_files
parentbb6e0834e0f55070e4406ca4d385c9e6dc246655 (diff)
use full library paths for openexr & msvc, also remove unneeded exr includes
Diffstat (limited to 'build_files')
-rw-r--r--build_files/cmake/macros.cmake5
1 files changed, 3 insertions, 2 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 10d6f712da1..1e8c66f9302 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -214,14 +214,15 @@ macro(setup_liblinks
if(WITH_IMAGE_TIFF)
target_link_libraries(${target} ${TIFF_LIBRARY})
endif()
- if(WITH_IMAGE_OPENEXR)
if(WIN32 AND NOT UNIX)
foreach(_LOOP_VAR ${OPENEXR_LIBRARIES})
+ string(REGEX REPLACE ".lib$" "_d.lib" _LOOP_VAR_DEBUG ${_LOOP_VAR})
target_link_libraries(${target}
- debug ${_LOOP_VAR}_d
+ debug ${_LOOP_VAR_DEBUG}
optimized ${_LOOP_VAR})
endforeach()
unset(_LOOP_VAR)
+ unset(_LOOP_VAR_DEBUG)
else()
target_link_libraries(${target} ${OPENEXR_LIBRARIES})
endif()