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-08-05 22:21:22 +0400
committerJens Verwiebe <info@jensverwiebe.de>2014-08-05 22:21:22 +0400
commit86e9f84be79c6329c2e972304242e307b3d70e42 (patch)
treec07769720f0ab880f179799d77bc31b5998ebc90 /CMakeLists.txt
parente4146e6fa349bc880377a5200fc897a5afad431a (diff)
OSX/cmake: move last commited line to a better place
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b53a990fbff..4349105929d 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