From d33456e5ec70255a21089aa4c3dd7dc48307a344 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 17 Aug 2018 12:40:31 +0200 Subject: Build Environment: fixes for Linux after recent updates. --- build_files/cmake/platform/platform_unix.cmake | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'build_files/cmake/platform/platform_unix.cmake') diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index 75222b6663f..74958a8731c 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") -- cgit v1.2.3