[polly] r326702 - [Polly][CMake] Fix lit setup for building the in the mono repo

Philip Pfaffe via llvm-commits llvm-commits at lists.llvm.org
Mon Mar 5 06:43:04 PST 2018


Author: pfaffe
Date: Mon Mar  5 06:43:04 2018
New Revision: 326702

URL: http://llvm.org/viewvc/llvm-project?rev=326702&view=rev
Log:
[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

Modified:
    polly/trunk/test/CMakeLists.txt

Modified: polly/trunk/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/CMakeLists.txt?rev=326702&r1=326701&r2=326702&view=diff
==============================================================================
--- polly/trunk/test/CMakeLists.txt (original)
+++ polly/trunk/test/CMakeLists.txt Mon Mar  5 06:43:04 2018
@@ -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




More information about the llvm-commits mailing list