diff options
| author | Chris Bieneman <beanz@apple.com> | 2016-08-29 21:26:32 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2016-08-29 21:26:32 +0000 |
| commit | 5349efc6b7b9512d96458118296ec786d9193de1 (patch) | |
| tree | a8018e4796454c4778e4eb991242bd2d90d2fad0 /llvm/docs | |
| parent | 8fcff934bae29c54d68bc94134136d9e8fb9a208 (diff) | |
| download | bcm5719-llvm-5349efc6b7b9512d96458118296ec786d9193de1.tar.gz bcm5719-llvm-5349efc6b7b9512d96458118296ec786d9193de1.zip | |
[CMake] Make LLVMConfig.cmake variable names match in-tree names
With the runtimes build we're trying to use LLVMConfig.cmake as a way of providing LLVM_* variables that are needed to behave as if the project is building in tree. To make this work we need to rename two variables by dropping the "S" from the end. This makes the variables match the in-tree names.
This renames:
LLVM_INCLUDE_DIRS -> LLVM_INCLUDE_DIR
LLVM_LIBRARY_DIRS -> LLVM_LIBRARY_DIR
The versions ending in S are not used in-tree anywhere. This also cleans up LLVM_LIBRARY_DIR being set to the same value with and without the "S".
llvm-svn: 280013
Diffstat (limited to 'llvm/docs')
| -rw-r--r-- | llvm/docs/CMake.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/llvm/docs/CMake.rst b/llvm/docs/CMake.rst index 5d57bc98596..cf5d6b55a40 100644 --- a/llvm/docs/CMake.rst +++ b/llvm/docs/CMake.rst @@ -579,7 +579,7 @@ and uses them to build a simple application ``simple-tool``. # you will need to enable C++11 support # for your compiler. - include_directories(${LLVM_INCLUDE_DIRS}) + include_directories(${LLVM_INCLUDE_DIR}) add_definitions(${LLVM_DEFINITIONS}) # Now build our tools @@ -636,8 +636,8 @@ include This is set to ON if LLVM was built with run time type information (RTTI), otherwise OFF. -``LLVM_INCLUDE_DIRS`` - A list of include paths to directories containing LLVM header files. +``LLVM_INCLUDE_DIR`` + Path to the root directory containing LLVM header files. ``LLVM_PACKAGE_VERSION`` The LLVM version. This string can be used with CMake conditionals, e.g., ``if @@ -681,7 +681,7 @@ Contents of ``<project dir>/CMakeLists.txt``: find_package(LLVM REQUIRED CONFIG) add_definitions(${LLVM_DEFINITIONS}) - include_directories(${LLVM_INCLUDE_DIRS}) + include_directories(${LLVM_INCLUDE_DIR}) add_subdirectory(<pass name>) |
