sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

cmake - cached LLVM values would be overwritten on every execution.

Browse Source
This commit is contained in:
Campbell Barton 2013-09-25 17:04:01 +00:00
parent 124f32a206
commit c4bad6868f
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
CMakeLists.txt
View File

@ -798,15 +798,25 @@ if(UNIX AND NOT APPLE)
find_program(LLVM_CONFIG llvm-config) find_program(LLVM_CONFIG llvm-config)
endif() endif()
endif() endif()
execute_process(COMMAND ${LLVM_CONFIG} --version
OUTPUT_VARIABLE LLVM_VERSION if(NOT DEFINED LLVM_VERSION)
OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND ${LLVM_CONFIG} --version
execute_process(COMMAND ${LLVM_CONFIG} --prefix OUTPUT_VARIABLE LLVM_VERSION
OUTPUT_VARIABLE LLVM_DIRECTORY OUTPUT_STRIP_TRAILING_WHITESPACE)
OUTPUT_STRIP_TRAILING_WHITESPACE) set(LLVM_VERSION ${LLVM_VERSION} CACHE STRING "Version of LLVM to use")
execute_process(COMMAND ${LLVM_CONFIG} --libdir endif()
OUTPUT_VARIABLE LLVM_LIBPATH if(NOT DEFINED LLVM_DIRECTORY)
OUTPUT_STRIP_TRAILING_WHITESPACE) 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) if(LLVM_STATIC)
find_library(LLVM_LIBRARY find_library(LLVM_LIBRARY
@ -818,11 +828,6 @@ if(UNIX AND NOT APPLE)
PATHS ${LLVM_LIBPATH}) PATHS ${LLVM_LIBPATH})
endif() 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_LIBRARY AND LLVM_DIRECTORY AND LLVM_LIBPATH)
if(LLVM_STATIC) if(LLVM_STATIC)
@ -832,7 +837,7 @@ if(UNIX AND NOT APPLE)
execute_process(COMMAND ${LLVM_CONFIG} --libfiles execute_process(COMMAND ${LLVM_CONFIG} --libfiles
OUTPUT_VARIABLE LLVM_LIBRARY OUTPUT_VARIABLE LLVM_LIBRARY
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
string(REPLACE " " ";" LLVM_LIBRARY ${LLVM_LIBRARY}) string(REPLACE " " ";" LLVM_LIBRARY "${LLVM_LIBRARY}")
endif() endif()
else() else()
message(FATAL_ERROR "LLVM not found.") message(FATAL_ERROR "LLVM not found.")