diff options
| author | Jonas Hahnfeld <hahnjo@hahnjo.de> | 2018-05-25 15:56:41 +0000 |
|---|---|---|
| committer | Jonas Hahnfeld <hahnjo@hahnjo.de> | 2018-05-25 15:56:41 +0000 |
| commit | 65e0b8784ce01f8f572581bb0c4abcbe37162844 (patch) | |
| tree | 7048cebe6602351bfb0c2801c007aa43fa008675 /openmp/CMakeLists.txt | |
| parent | 7411d61c03e8feb49491ab84f600d18b5fd92581 (diff) | |
| download | llvm-65e0b8784ce01f8f572581bb0c4abcbe37162844.tar.gz | |
[CMake] Unify install path for libraries
Introduce OPENMP_INSTALL_LIBDIR and use in all install() commands.
This also fixes installation of libomptarget-nvptx that previously
didn't honor {OPENMP,LLVM}_LIBDIR_SUFFIX.
Differential Revision: https://reviews.llvm.org/D47130
llvm-svn: 333284
Diffstat (limited to 'openmp/CMakeLists.txt')
| -rw-r--r-- | openmp/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/openmp/CMakeLists.txt b/openmp/CMakeLists.txt index 8afa0df73bb5..597eedcec0b5 100644 --- a/openmp/CMakeLists.txt +++ b/openmp/CMakeLists.txt @@ -18,6 +18,8 @@ if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_S "Enable -Werror flags to turn warnings into errors for supporting compilers.") set(OPENMP_LIBDIR_SUFFIX "" CACHE STRING "Suffix of lib installation directory, e.g. 64 => lib64") + # Do not use OPENMP_LIBDIR_SUFFIX directly, use OPENMP_INSTALL_LIBDIR. + set(OPENMP_INSTALL_LIBDIR "lib${OPENMP_LIBDIR_SUFFIX}") # Group test settings. set(OPENMP_TEST_C_COMPILER ${CMAKE_C_COMPILER} CACHE STRING @@ -28,7 +30,7 @@ if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_S else() set(OPENMP_ENABLE_WERROR ${LLVM_ENABLE_WERROR}) # If building in tree, we honor the same install suffix LLVM uses. - set(OPENMP_LIBDIR_SUFFIX ${LLVM_LIBDIR_SUFFIX}) + set(OPENMP_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}") if (NOT MSVC) set(OPENMP_TEST_C_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang) |