[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51625] trunk/blender/CMakeLists.txt: Fix for cmake syntax error: LLVM_VERSION string was not configurable, causing linker errors for people not using the default LLVM version (3. 0 on Linux, 3.1 on OSX).
Lukas Toenne
lukas.toenne at googlemail.com
Thu Oct 25 16:31:56 CEST 2012
Revision: 51625
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51625
Author: lukastoenne
Date: 2012-10-25 14:31:52 +0000 (Thu, 25 Oct 2012)
Log Message:
-----------
Fix for cmake syntax error: LLVM_VERSION string was not configurable, causing linker errors for people not using the default LLVM version (3.0 on Linux, 3.1 on OSX).
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2012-10-25 13:32:05 UTC (rev 51624)
+++ trunk/blender/CMakeLists.txt 2012-10-25 14:31:52 UTC (rev 51625)
@@ -717,7 +717,7 @@
if(WITH_LLVM)
set(LLVM_DIRECTORY ${LIBDIR}/llvm CACHE PATH "Path to the LLVM installation")
- set(LLVM_VERSION "3.0" CACHE STRING "Version of LLVM to use" "")
+ set(LLVM_VERSION "3.0" CACHE STRING "Version of LLVM to use")
set(LLVM_STATIC YES)
if(LLVM_DIRECTORY)
set(LLVM_CONFIG "${LLVM_DIRECTORY}/bin/llvm-config")
@@ -1610,7 +1610,7 @@
if(WITH_LLVM)
set(LLVM_DIRECTORY ${LIBDIR}/llvm CACHE PATH "Path to the LLVM installation")
- set(LLVM_VERSION "3.1" CACHE STRING "Version of LLVM to use" "")
+ set(LLVM_VERSION "3.1" CACHE STRING "Version of LLVM to use")
set(LLVM_STATIC YES)
if(LLVM_DIRECTORY)
set(LLVM_CONFIG "${LLVM_DIRECTORY}/bin/llvm-config")
More information about the Bf-blender-cvs
mailing list