diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-17 14:00:52 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-17 14:00:52 +0300 |
| commit | 7d720cc655b43af7c871a3715eb9fd5d3ffd753a (patch) | |
| tree | f9e50a5f7217ea4f27f67b12ae785b082d7a14d9 /build_files/cmake/platform/platform_unix.cmake | |
| parent | 9f0f8aabe2ca751386390ecb4121a3ae04107676 (diff) | |
| parent | d33456e5ec70255a21089aa4c3dd7dc48307a344 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files/cmake/platform/platform_unix.cmake')
| -rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index 32a2d695895..8c11e93e81a 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -353,16 +353,19 @@ if(WITH_OPENCOLORIO) endif() if(WITH_LLVM) - # Symbol conflicts with same UTF library used by OpenCollada if(EXISTS ${LIBDIR}) set(LLVM_STATIC ON) - if(WITH_OPENCOLLADA) - list(REMOVE_ITEM OPENCOLLADA_LIBRARIES ${OPENCOLLADA_UTF_LIBRARY}) - endif() endif() find_package_wrapper(LLVM) + # Symbol conflicts with same UTF library used by OpenCollada + if(EXISTS ${LIBDIR}) + if(WITH_OPENCOLLADA AND (${LLVM_VERSION} VERSION_LESS "4.0.0")) + list(REMOVE_ITEM OPENCOLLADA_LIBRARIES ${OPENCOLLADA_UTF_LIBRARY}) + endif() + endif() + if(NOT LLVM_FOUND) set(WITH_LLVM OFF) message(STATUS "LLVM not found") |