summaryrefslogtreecommitdiff
path: root/CMake
diff options
context:
space:
mode:
authorZhigang Gong <zhigang.gong@linux.intel.com>2012-12-19 14:18:23 +0800
committerZhigang Gong <zhigang.gong@linux.intel.com>2013-04-10 14:51:29 +0800
commitaf5a1f00b47588a44f1d864d0b58458002b12e10 (patch)
treed156d7ae60a292521a01041304f7c580ca3709ca /CMake
parent4ad7cad1a56463913c1763ae0ffa90df8b3d1d83 (diff)
Keep consistent naming rule for LLVM_XXX Cmake variables.
Also fixed inconsistent indentation in FindLLVM.cmake and remove some unecessary blank lines. Based on patch from guanqun. Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Diffstat (limited to 'CMake')
-rw-r--r--CMake/FindLLVM.cmake19
1 files changed, 7 insertions, 12 deletions
diff --git a/CMake/FindLLVM.cmake b/CMake/FindLLVM.cmake
index 351fd762..391e2626 100644
--- a/CMake/FindLLVM.cmake
+++ b/CMake/FindLLVM.cmake
@@ -1,11 +1,11 @@
# Find the native LLVM includes and library
#
-# LLVM_INCLUDE_DIR - where to find llvm include files
-# LLVM_LIBRARY_DIRS - where to find llvm libs
-# LLVM_CFLAGS - llvm compiler flags
-# LLVM_LFLAGS - llvm linker flags
-# LLVM_MODULE_LIBS - list of llvm libs for working with modules.
-# LLVM_FOUND - True if llvm found.
+# LLVM_INCLUDE_DIR - where to find llvm include files
+# LLVM_LIBRARY_DIR - where to find llvm libs
+# LLVM_CFLAGS - llvm compiler flags
+# LLVM_LFLAGS - llvm linker flags
+# LLVM_MODULE_LIBS - list of llvm libs for working with modules.
+# LLVM_FOUND - True if llvm found.
find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config llvm-config-32 llvm-config-3.0 DOC "llvm-config executable")
if (LLVM_CONFIG_EXECUTABLE)
@@ -16,21 +16,16 @@ endif (LLVM_CONFIG_EXECUTABLE)
if (LLVM_FIND_VERSION_MAJOR AND LLVM_FIND_VERSION_MINOR)
SET(LLVM_FIND_VERSION_NODOT "${LLVM_FIND_VERSION_MAJOR}${LLVM_FIND_VERSION_MINOR}")
-
execute_process(
COMMAND ${LLVM_CONFIG_EXECUTABLE} --version
OUTPUT_VARIABLE LLVM_VERSION
)
-
string(REGEX REPLACE "([0-9]*)\\.([0-9]*)[^0-9]*" "\\1\\2 " LLVM_VERSION_NODOT ${LLVM_VERSION})
if (LLVM_VERSION_NODOT VERSION_LESS LLVM_FIND_VERSION_NODOT)
message(FATAL_ERROR "imcompatible LLVM version ${LLVM_VERSION_NODOT} required ${LLVM_FIND_VERSION}")
endif (LLVM_VERSION_NODOT VERSION_LESS LLVM_FIND_VERSION_NODOT)
-
endif (LLVM_FIND_VERSION_MAJOR AND LLVM_FIND_VERSION_MINOR)
-
-
execute_process(
COMMAND ${LLVM_CONFIG_EXECUTABLE} --includedir
OUTPUT_VARIABLE LLVM_INCLUDE_DIR
@@ -39,7 +34,7 @@ execute_process(
execute_process(
COMMAND ${LLVM_CONFIG_EXECUTABLE} --libdir
- OUTPUT_VARIABLE LLVM_LIBRARY_DIRS
+ OUTPUT_VARIABLE LLVM_LIBRARY_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE
)