[llvm-commits] [polly] r152924 - in /polly/trunk/test: CMakeLists.txt lit.site.cfg.in

[Hongbin Zheng]

Author: ether
Date: Fri Mar 16 09:34:20 2012
New Revision: 152924

URL: http://llvm.org/viewvc/llvm-project?rev=152924&view=rev
Log:
Off-tree build support: Set the path of Polly's library correctly.

Modified:
    polly/trunk/test/CMakeLists.txt
    polly/trunk/test/lit.site.cfg.in

Modified: polly/trunk/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/CMakeLists.txt?rev=152924&r1=152923&r2=152924&view=diff
==============================================================================
--- polly/trunk/test/CMakeLists.txt (original)
+++ polly/trunk/test/CMakeLists.txt Fri Mar 16 09:34:20 2012
@@ -22,6 +22,7 @@
   set(LLVM_BINARY_DIR "${LLVM_INSTALL_ROOT}")
   set(LLVM_TOOLS_DIR "${LLVM_INSTALL_ROOT}/bin")
   set(LLVM_LIBS_DIR "${LLVM_INSTALL_ROOT}/lib")
+  set(POLLY_LIB_DIR "${POLLY_BINARY_DIR}/lib")
 else (NOT DEFINED LLVM_MAIN_SRC_DIR)
   set(LLVM_LIT ${LLVM_TOOLS_BINARY_DIR}/llvm-lit)
   set(POLLY_TEST_DEPS opt lli LLVMPolly FileCheck not)
@@ -29,6 +30,7 @@
   set(LLVM_BINARY_DIR "${LLVM_BINARY_DIR}")
   set(LLVM_TOOLS_DIR "${LLVM_TOOLS_BINARY_DIR}/")
   set(LLVM_LIBS_DIR "${LLVM_BINARY_DIR}/lib")
+  set(POLLY_LIB_DIR "${LLVM_LIBS_DIR}")
 endif (NOT DEFINED LLVM_MAIN_SRC_DIR)
 
 configure_file(

Modified: polly/trunk/test/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/lit.site.cfg.in?rev=152924&r1=152923&r2=152924&view=diff
==============================================================================
--- polly/trunk/test/lit.site.cfg.in (original)
+++ polly/trunk/test/lit.site.cfg.in Fri Mar 16 09:34:20 2012
@@ -5,6 +5,7 @@
 config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
 config.llvm_libs_dir = "@LLVM_LIBS_DIR@"
 config.polly_obj_root = "@POLLY_BINARY_DIR@"
+config.polly_lib_dir = "@POLLY_LIB_DIR@"
 config.target_triple = "@TARGET_TRIPLE@"
 lit.params['build_config'] = "@POLLY_SOURCE_DIR@/test"
 
@@ -18,7 +19,7 @@
     lit.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key))
 
 config.substitutions.append(('%loadPolly', '-load '
-                             + config.llvm_libs_dir + '/LLVMPolly at LLVM_SHLIBEXT@'))
+                             + config.polly_lib_dir + '/LLVMPolly at LLVM_SHLIBEXT@'))
 config.substitutions.append(('%defaultOpts', ' -basicaa -polly-prepare -polly-region-simplify -scev-aa '))
 config.substitutions.append(('%polybenchOpts', ' -O3 -loop-simplify -indvars '))