[Bf-blender-cvs] [86e9f84] master: OSX/cmake: move last commited line to a better place

Jens Verwiebe noreply at git.blender.org
Tue Aug 5 20:21:37 CEST 2014


Commit: 86e9f84be79c6329c2e972304242e307b3d70e42
Author: Jens Verwiebe
Date:   Tue Aug 5 20:21:22 2014 +0200
Branches: master
https://developer.blender.org/rB86e9f84be79c6329c2e972304242e307b3d70e42

OSX/cmake: move last commited line to a better place

===================================================================

M	CMakeLists.txt

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b53a990..4349105 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1862,6 +1862,7 @@ elseif(APPLE)
 	endif()
 
 	if(WITH_LLVM)
+		set(LLVM_STATIC ON CACHE BOOL "ON" FORCE) # we use always the static libs default, else gives linking errors
 		set(LLVM_DIRECTORY ${LIBDIR}/llvm CACHE PATH	"Path to the LLVM installation")
 		set(LLVM_VERSION "3.4" CACHE STRING	"Version of LLVM to use")
 		if(EXISTS "${LLVM_DIRECTORY}/bin/llvm-config")
@@ -1883,7 +1884,6 @@ elseif(APPLE)
 		             PATHS ${LLVM_LIBPATH})
 
 		if(LLVM_LIBRARY AND LLVM_DIRECTORY AND LLVM_LIBPATH)
-			set(LLVM_STATIC ON CACHE BOOL "ON" FORCE) # we use always the static libs default, else gives linking errors
 			if(LLVM_STATIC)
 				# if static LLVM libraries were requested, use llvm-config to generate
 				# the list of what libraries we need, and substitute that in the right




More information about the Bf-blender-cvs mailing list