diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2022-08-25 18:13:46 +0300 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2022-08-25 18:13:46 +0300 |
| commit | 34fe6ddce11e4e0e31a96669ab5f200e5fb8a747 (patch) | |
| tree | 0fa4c894cd7c1719c4edee013eb812fbaa22033e /polly | |
| parent | f7bbe099c996aa38ceee701eea9bd81cfe6066e3 (diff) | |
Revert "[CMake] Avoid `LLVM_BINARY_DIR` when other more specific variable are better-suited"
This reverts commit ad8c34bc3089d847a09bb740f7a58c96073e0959.
Diffstat (limited to 'polly')
| -rw-r--r-- | polly/cmake/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | polly/test/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/polly/cmake/CMakeLists.txt b/polly/cmake/CMakeLists.txt index 183410734cef..4c528d562e23 100644 --- a/polly/cmake/CMakeLists.txt +++ b/polly/cmake/CMakeLists.txt @@ -12,7 +12,7 @@ set(polly_cmake_builddir "${POLLY_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/pol set(LLVM_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/llvm" CACHE STRING "Path for CMake subdirectory for LLVM (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/llvm')") # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. -set(llvm_cmake_builddir "${LLVM_LIBRARY_DIR}/cmake/llvm") +set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") if (CMAKE_CONFIGURATION_TYPES) set(POLLY_EXPORTS_FILE_NAME "PollyExports-$<LOWER_CASE:$<CONFIG>>.cmake") diff --git a/polly/test/CMakeLists.txt b/polly/test/CMakeLists.txt index 81cee34a780d..e87f99ca692d 100644 --- a/polly/test/CMakeLists.txt +++ b/polly/test/CMakeLists.txt @@ -46,7 +46,7 @@ endif () set(LLVM_BINARY_DIR "${LLVM_BINARY_DIR}") set(LLVM_TOOLS_DIR "${LLVM_TOOLS_BINARY_DIR}") -set(LLVM_LIBS_DIR "${LLVM_LIBRARY_DIR}") +set(LLVM_LIBS_DIR "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}") if (CMAKE_LIBRARY_OUTPUT_DIRECTORY) set(POLLY_LIB_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) else() |