diff options
| author | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2016-08-26 15:28:39 +0300 |
|---|---|---|
| committer | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2016-08-26 15:28:51 +0300 |
| commit | fcffb14d7b9db44647b324a80213206d0e0decb1 (patch) | |
| tree | c3b0325fe01c0ef30fed8041c4cdb2635c11c044 | |
| parent | 62b1cdd66e39db58e422e15b20a80d5e05f3dd4f (diff) | |
Fix linking issue with OpenEXR and Zlib.
Link Zlib after OpenEXR.
Differential Revision: https://developer.blender.org/D2176
| -rw-r--r-- | build_files/cmake/macros.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index c4e1c56699e..dc8b158f5c0 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -359,7 +359,6 @@ function(setup_liblinks target_link_libraries( ${target} ${PNG_LIBRARIES} - ${ZLIB_LIBRARIES} ${FREETYPE_LIBRARY} ) @@ -510,6 +509,11 @@ function(setup_liblinks endif() endif() + target_link_libraries( + ${target} + ${ZLIB_LIBRARIES} + ) + #system libraries with no dependencies such as platform link libs or opengl should go last target_link_libraries(${target} ${BLENDER_GL_LIBRARIES}) |