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:
authorJens Verwiebe <info@jensverwiebe.de>2014-07-29 21:46:05 +0400
committerJens Verwiebe <info@jensverwiebe.de>2014-07-29 21:46:15 +0400
commitf557b477ad3a884a467bc7baecc22512bfaa4bc4 (patch)
tree7d8d50eb20666a4152739fce4eb828481ee8ee39 /CMakeLists.txt
parent42ba931fedf7e994781d80ad919e0b02aec9019f (diff)
OSX/cmake: fix linking utf-functions if llvm is disabled
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8be3a9ba6a7..ca83e9dccbe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1772,6 +1772,10 @@ elseif(APPLE)
set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
set(OPENCOLLADA_LIBRARIES "OpenCOLLADASaxFrameworkLoader -lOpenCOLLADAFramework -lOpenCOLLADABaseUtils -lOpenCOLLADAStreamWriter -lMathMLSolver -lGeneratedSaxParser -lxml2 -lbuffer -lftoa")
+ # Use UTF functions from collada if LLVM is not enabled
+ if(NOT WITH_LLVM)
+ set(OPENCOLLADA_LIBRARIES "${OPENCOLLADA_LIBRARIES} -lUTF")
+ endif()
# pcre is bundled with openCollada
#set(PCRE ${LIBDIR}/pcre)
#set(PCRE_LIBPATH ${PCRE}/lib)