Commit: f557b477ad3a884a467bc7baecc22512bfaa4bc4
Author: Jens Verwiebe
Date: Tue Jul 29 19:46:05 2014 +0200
Branches: master
https://developer.blender.org/rBf557b477ad3a884a467bc7baecc22512bfaa4bc4
OSX/cmake: fix linking utf-functions if llvm is disabled
===================================================================
M CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8be3a9b..ca83e9d 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)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
