diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-09-25 20:31:54 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-09-25 20:31:54 +0400 |
| commit | 124f32a206925b2fe98a8c0b005cc64ad797b421 (patch) | |
| tree | 12f0fae9d6ae933faaefe8b2e80cfd67a8a45823 /CMakeLists.txt | |
| parent | 8bbe81db4deaeab0e34a25bb4cf9332374ba6860 (diff) | |
rename LLVM_LIB_DIR to LLVM_LIBPATH to match other cmake vars.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fac32ac835..e08ab0ce5ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -805,26 +805,26 @@ if(UNIX AND NOT APPLE) OUTPUT_VARIABLE LLVM_DIRECTORY OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND ${LLVM_CONFIG} --libdir - OUTPUT_VARIABLE LLVM_LIB_DIR + OUTPUT_VARIABLE LLVM_LIBPATH OUTPUT_STRIP_TRAILING_WHITESPACE) if(LLVM_STATIC) find_library(LLVM_LIBRARY NAMES LLVMAnalysis # first of a whole bunch of libs to get - PATHS ${LLVM_LIB_DIR}) + PATHS ${LLVM_LIBPATH}) else() find_library(LLVM_LIBRARY NAMES LLVM-${LLVM_VERSION} - PATHS ${LLVM_LIB_DIR}) + PATHS ${LLVM_LIBPATH}) endif() message(STATUS "LLVM version = ${LLVM_VERSION}") message(STATUS "LLVM dir = ${LLVM_DIRECTORY}") - message(STATUS "LLVM lib dir = ${LLVM_LIB_DIR}") + 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_LIB_DIR) + if(LLVM_LIBRARY AND LLVM_DIRECTORY AND LLVM_LIBPATH) 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 @@ -1449,7 +1449,7 @@ elseif(WIN32) if(WITH_LLVM) set(LLVM_DIRECTORY ${LIBDIR}/llvm CACHE PATH "Path to the LLVM installation") - set(LLVM_LIB_DIR ${LLVM_DIRECTORY}/lib) + set(LLVM_LIBPATH ${LLVM_DIRECTORY}/lib) # Explicitly set llvm lib order. #---- WARNING ON GCC ORDER OF LIBS IS IMPORTANT, DO NOT CHANGE! --------- set(LLVM_LIBRARY LLVMSelectionDAG LLVMCodeGen LLVMScalarOpts LLVMAnalysis LLVMArchive @@ -1743,13 +1743,13 @@ elseif(APPLE) OUTPUT_VARIABLE LLVM_DIRECTORY OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND ${LLVM_CONFIG} --libdir - OUTPUT_VARIABLE LLVM_LIB_DIR + OUTPUT_VARIABLE LLVM_LIBPATH OUTPUT_STRIP_TRAILING_WHITESPACE) find_library(LLVM_LIBRARY NAMES LLVMAnalysis # first of a whole bunch of libs to get - PATHS ${LLVM_LIB_DIR}) + PATHS ${LLVM_LIBPATH}) - if(LLVM_LIBRARY AND LLVM_DIRECTORY AND LLVM_LIB_DIR) + if(LLVM_LIBRARY AND LLVM_DIRECTORY AND LLVM_LIBPATH) 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 |