[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60369] trunk/blender/CMakeLists.txt: cmake - cached LLVM values would be overwritten on every execution.
Campbell Barton
ideasman42 at gmail.com
Wed Sep 25 19:04:02 CEST 2013
Revision: 60369
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60369
Author: campbellbarton
Date: 2013-09-25 17:04:01 +0000 (Wed, 25 Sep 2013)
Log Message:
-----------
cmake - cached LLVM values would be overwritten on every execution.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2013-09-25 16:31:54 UTC (rev 60368)
+++ trunk/blender/CMakeLists.txt 2013-09-25 17:04:01 UTC (rev 60369)
@@ -798,16 +798,26 @@
find_program(LLVM_CONFIG llvm-config)
endif()
endif()
- execute_process(COMMAND ${LLVM_CONFIG} --version
- OUTPUT_VARIABLE LLVM_VERSION
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- execute_process(COMMAND ${LLVM_CONFIG} --prefix
- OUTPUT_VARIABLE LLVM_DIRECTORY
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- execute_process(COMMAND ${LLVM_CONFIG} --libdir
- OUTPUT_VARIABLE LLVM_LIBPATH
- OUTPUT_STRIP_TRAILING_WHITESPACE)
+ if(NOT DEFINED LLVM_VERSION)
+ execute_process(COMMAND ${LLVM_CONFIG} --version
+ OUTPUT_VARIABLE LLVM_VERSION
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ set(LLVM_VERSION ${LLVM_VERSION} CACHE STRING "Version of LLVM to use")
+ endif()
+ if(NOT DEFINED LLVM_DIRECTORY)
+ execute_process(COMMAND ${LLVM_CONFIG} --prefix
+ OUTPUT_VARIABLE LLVM_DIRECTORY
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ set(LLVM_DIRECTORY ${LLVM_DIRECTORY} CACHE PATH "Path to the LLVM installation")
+ endif()
+ if(NOT DEFINED LLVM_LIBPATH)
+ execute_process(COMMAND ${LLVM_CONFIG} --libdir
+ OUTPUT_VARIABLE LLVM_LIBPATH
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ set(LLVM_LIBPATH ${LLVM_LIBPATH} CACHE PATH "Path to the LLVM library path")
+ endif()
+
if(LLVM_STATIC)
find_library(LLVM_LIBRARY
NAMES LLVMAnalysis # first of a whole bunch of libs to get
@@ -818,11 +828,6 @@
PATHS ${LLVM_LIBPATH})
endif()
- message(STATUS "LLVM version = ${LLVM_VERSION}")
- message(STATUS "LLVM dir = ${LLVM_DIRECTORY}")
- message(STATUS "LLVM lib dir = ${LLVM_LIBPATH}")
- set(LLVM_VERSION ${LLVM_VERSION} CACHE STRING "Version of LLVM to use")
- set(LLVM_DIRECTORY ${LLVM_DIRECTORY} CACHE PATH "Path to the LLVM installation")
if(LLVM_LIBRARY AND LLVM_DIRECTORY AND LLVM_LIBPATH)
if(LLVM_STATIC)
@@ -832,7 +837,7 @@
execute_process(COMMAND ${LLVM_CONFIG} --libfiles
OUTPUT_VARIABLE LLVM_LIBRARY
OUTPUT_STRIP_TRAILING_WHITESPACE)
- string(REPLACE " " ";" LLVM_LIBRARY ${LLVM_LIBRARY})
+ string(REPLACE " " ";" LLVM_LIBRARY "${LLVM_LIBRARY}")
endif()
else()
message(FATAL_ERROR "LLVM not found.")
More information about the Bf-blender-cvs
mailing list