[PATCH] D44078: [Polly][CMake] Fix lit setup for building the in the mono repo

[Philip Pfaffe via Phabricator via llvm-commits]

philip.pfaffe created this revision.
philip.pfaffe added reviewers: Meinersbur, grosser.
Herald added subscribers: bollu, mgorny.
Herald added a reviewer: bollu.

When building polly as part of the monorepo (actually, as part of any setup
using LLVM_ENABLE_PROJECTS), the LLVMPolly library used in the lit tests ends
up in a different directory in the build tree than in an in-tree build


Repository:
  rPLO Polly

https://reviews.llvm.org/D44078

Files:
  test/CMakeLists.txt


Index: test/CMakeLists.txt
===================================================================
--- test/CMakeLists.txt
+++ test/CMakeLists.txt
@@ -47,7 +47,11 @@
 set(LLVM_BINARY_DIR "${LLVM_BINARY_DIR}")
 set(LLVM_TOOLS_DIR "${LLVM_TOOLS_BINARY_DIR}")
 set(LLVM_LIBS_DIR "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}")
-set(POLLY_LIB_DIR "${POLLY_BINARY_DIR}/lib")
+if (CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+  set(POLLY_LIB_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
+else()
+  set(POLLY_LIB_DIR "${POLLY_BINARY_DIR}/lib")
+endif()
 
 configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D44078.136939.patch
Type: text/x-patch
Size: 597 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180304/c6212805/attachment.bin>