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:
authorThomas Dinges <blender@dingto.org>2014-08-06 02:45:13 +0400
committerThomas Dinges <blender@dingto.org>2014-08-06 02:45:13 +0400
commitc689a2ea8c016d3dffda73fc5916ad2717ffc2e1 (patch)
treeb76bacbe6f109671415e1744abb9dadb929a56b1 /build_files/cmake/macros.cmake
parent2c331302773bfbd725c1a9a102b7e637a46a2a2f (diff)
parent4cf531f7a05434a9bbd6144a7ec0314e60aaff40 (diff)
Merge remote-tracking branch 'origin/master' into soc-2014-cyclessoc-2014-cycles
Diffstat (limited to 'build_files/cmake/macros.cmake')
-rw-r--r--build_files/cmake/macros.cmake6
1 files changed, 6 insertions, 0 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index f896fb9d6a9..adbba817150 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -411,6 +411,12 @@ macro(setup_liblinks
endif()
target_link_libraries(${target} ${PLATFORM_LINKLIBS} ${CMAKE_DL_LIBS})
+
+ # We put CLEW and CUEW here because OPENSUBDIV_LIBRARIES dpeends on them..
+ if(WITH_CYCLES OR WITH_COMPOSITOR OR WITH_OPENSUBDIV)
+ target_link_libraries(${target} "extern_clew")
+ target_link_libraries(${target} "extern_cuew")
+ endif()
endmacro()
macro(SETUP_BLENDER_SORTED_LIBS)