From 15186d493818ca82087ef766d3f488cc16062787 Mon Sep 17 00:00:00 2001 From: Philip Pfaffe Date: Mon, 5 Mar 2018 14:43:04 +0000 Subject: [PATCH] [Polly][CMake] Fix lit setup for building the in the mono repo Summary: 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 Reviewers: Meinersbur, grosser, bollu Reviewed By: Meinersbur Subscribers: mgorny, bollu, pollydev, llvm-commits Differential Revision: https://reviews.llvm.org/D44078 llvm-svn: 326702 --- polly/test/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/polly/test/CMakeLists.txt b/polly/test/CMakeLists.txt index 0cc33c3..cf6efd1 100644 --- a/polly/test/CMakeLists.txt +++ b/polly/test/CMakeLists.txt @@ -47,7 +47,11 @@ endif () 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 -- 2.7.4