diff options
| author | Niels Ole Salscheider <niels_ole@salscheider-online.de> | 2016-02-04 20:08:19 +0000 |
|---|---|---|
| committer | Niels Ole Salscheider <niels_ole@salscheider-online.de> | 2016-02-04 20:08:19 +0000 |
| commit | fc814135313c0c846013142aa262adc6ad4c3cbd (patch) | |
| tree | 68db9b13d1af28118a72d0e841dc7fd2d02380c0 /llvm | |
| parent | b4e8a1b3087347b78d57e467186f5113454a2816 (diff) | |
| download | bcm5719-llvm-fc814135313c0c846013142aa262adc6ad4c3cbd.tar.gz bcm5719-llvm-fc814135313c0c846013142aa262adc6ad4c3cbd.zip | |
Install cmake files to lib/cmake/llvm
This is the right location for platform-specific files.
On some distributions (e. g. Exherbo), a package can be installed for several
architectures in parallel, but the architecture-independent files are shared.
Therefore, we must not install architecture-dependent files (like the CMake
config and export files) to share/.
llvm-svn: 259821
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/cmake/modules/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | llvm/docs/CMake.rst | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt index f515cb09555..7ebd2a265e0 100644 --- a/llvm/cmake/modules/CMakeLists.txt +++ b/llvm/cmake/modules/CMakeLists.txt @@ -1,4 +1,4 @@ -set(LLVM_INSTALL_PACKAGE_DIR share/llvm/cmake) +set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") get_property(LLVM_EXPORTS GLOBAL PROPERTY LLVM_EXPORTS) diff --git a/llvm/docs/CMake.rst b/llvm/docs/CMake.rst index 6d61442ed97..7f667e72946 100644 --- a/llvm/docs/CMake.rst +++ b/llvm/docs/CMake.rst @@ -536,16 +536,16 @@ The ``find_package(...)`` directive when used in CONFIG mode (as in the above example) will look for the ``LLVMConfig.cmake`` file in various locations (see cmake manual for details). It creates a ``LLVM_DIR`` cache entry to save the directory where ``LLVMConfig.cmake`` is found or allows the user to specify the -directory (e.g. by passing ``-DLLVM_DIR=/usr/share/llvm/cmake`` to +directory (e.g. by passing ``-DLLVM_DIR=/usr/lib/cmake/llvm`` to the ``cmake`` command or by setting it directly in ``ccmake`` or ``cmake-gui``). This file is available in two different locations. -* ``<INSTALL_PREFIX>/share/llvm/cmake/LLVMConfig.cmake`` where +* ``<INSTALL_PREFIX>/lib/cmake/llvm/LLVMConfig.cmake`` where ``<INSTALL_PREFIX>`` is the install prefix of an installed version of LLVM. - On Linux typically this is ``/usr/share/llvm/cmake/LLVMConfig.cmake``. + On Linux typically this is ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. -* ``<LLVM_BUILD_ROOT>/share/llvm/cmake/LLVMConfig.cmake`` where +* ``<LLVM_BUILD_ROOT>/lib/cmake/llvm/LLVMConfig.cmake`` where ``<LLVM_BUILD_ROOT>`` is the root of the LLVM build tree. **Note: this is only available when building LLVM with CMake.** |
