[PATCH] D21543: [polly] Respect LLVM_INSTALL_TOOLCHAIN_ONLY

[Eugene Zelenko via llvm-commits]

Eugene.Zelenko created this revision.
Eugene.Zelenko added reviewers: grosser, _jdoerfert.
Eugene.Zelenko added a subscriber: llvm-commits.
Eugene.Zelenko set the repository for this revision to rL LLVM.

Only shared library should be installed when LLVM_INSTALL_TOOLCHAIN_ONLY=ON.

I'd like to remove empty autoconf directory in same commit.

I checked this patch on my own build on RHEL 6. Regressions were OK.

Repository:
  rL LLVM

http://reviews.llvm.org/D21543

Files:
  CMakeLists.txt
  cmake/polly_macros.cmake

Index: cmake/polly_macros.cmake
===================================================================
--- cmake/polly_macros.cmake
+++ cmake/polly_macros.cmake
@@ -43,10 +43,12 @@
   if( LLVM_LINK_COMPONENTS )
     llvm_config(${name} ${LLVM_LINK_COMPONENTS})
   endif( LLVM_LINK_COMPONENTS )
-  install(TARGETS ${name}
-    EXPORT LLVMExports
-    LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
-    ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
+  if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LLVMPolly")
+    install(TARGETS ${name}
+      EXPORT LLVMExports
+      LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
+      ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
+  endif()
   set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name})
 endmacro(add_polly_library)
 
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -137,20 +137,22 @@
   ${CMAKE_CURRENT_BINARY_DIR}/include
   )
 
-install(DIRECTORY include/
-  DESTINATION include
-  FILES_MATCHING
-  PATTERN "*.h"
-  PATTERN ".svn" EXCLUDE
-  )
+if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
+  install(DIRECTORY include/
+    DESTINATION include
+    FILES_MATCHING
+    PATTERN "*.h"
+    PATTERN ".svn" EXCLUDE
+    )
 
-install(DIRECTORY ${POLLY_BINARY_DIR}/include/
-  DESTINATION include
-  FILES_MATCHING
-  PATTERN "*.h"
-  PATTERN "CMakeFiles" EXCLUDE
-  PATTERN ".svn" EXCLUDE
-  )
+  install(DIRECTORY ${POLLY_BINARY_DIR}/include/
+    DESTINATION include
+    FILES_MATCHING
+    PATTERN "*.h"
+    PATTERN "CMakeFiles" EXCLUDE
+    PATTERN ".svn" EXCLUDE
+    )
+endif()
 
 add_definitions( -D_GNU_SOURCE )
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D21543.61330.patch
Type: text/x-patch
Size: 1659 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160621/8607d761/attachment.bin>