[polly] Respect LLVM_INSTALL_TOOLCHAIN_ONLY

[Eugene.Zelenko]

Summary

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.

[grosser]

Hi Eugene,

this patch LGTM, but please remove the autoconf directory in a separate commit. Both issues are independent and consequently should be addressed with independent commits. If you have commit rights, feel free to go ahead.

[Eugene.Zelenko]

I'll commit only CMake files changes.

[grosser]

In D21543#463483, @Eugene.Zelenko wrote:

I'll commit only CMake files changes.

Does this mean you do not plan to drop the autoconf directory any more? What was the reason you decided against it? From my perspective you can drop it without further review. The only thing I asked for to use different commits. I hope this did not discourage you.

[Eugene.Zelenko]

In D21543#463822, @grosser wrote:

In D21543#463483, @Eugene.Zelenko wrote:

I'll commit only CMake files changes.

Does this mean you do not plan to drop the autoconf directory any more? What was the reason you decided against it? From my perspective you can drop it without further review. The only thing I asked for to use different commits. I hope this did not discourage you.

Problem that removing autoconf directory require to commit ., and this conflicts with uncommitted D21488.

[grosser]

In D21543#463824, @Eugene.Zelenko wrote:

In D21543#463822, @grosser wrote:

In D21543#463483, @Eugene.Zelenko wrote:

I'll commit only CMake files changes.

Does this mean you do not plan to drop the autoconf directory any more? What was the reason you decided against it? From my perspective you can drop it without further review. The only thing I asked for to use different commits. I hope this did not discourage you.

Problem that removing autoconf directory require to commit ., and this conflicts with uncommitted D21488.

OK. So this seems to mostly be a shortcoming of the version control system. As the change is trivial and committing it seems to cause complications on your side, I just committed this myself in r273338. Thanks for reporting the leftover directory.

Best,
Tobias

PS: It seems you are still using svn. You might want consider the use of 'git', which makes working with patches a lot easier. This comes often handy when addressing review comments and working with more than one patch at a time.

[Eugene.Zelenko]

Thank you for suggestion! Actually I tried to use git for Include What You Use, but SubVersion is still easier for me because of past CVS background.

polly/trunk/CMakeLists.txt

include_directories(
   BEFORE
   ${CMAKE_CURRENT_SOURCE_DIR}/include
   ${CMAKE_CURRENT_SOURCE_DIR}/lib/JSON/include
   ${CMAKE_CURRENT_BINARY_DIR}/lib/External/isl/include
   ${CMAKE_CURRENT_SOURCE_DIR}/lib/External/isl/include
   ${CMAKE_CURRENT_BINARY_DIR}/include
   )
 
+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
     )
+endif()
 
 add_definitions( -D_GNU_SOURCE )
 
 add_subdirectory(docs)
 add_subdirectory(lib)
 add_subdirectory(test)
 add_subdirectory(tools)
 # TODO: docs.

polly/trunk/cmake/polly_macros.cmake

if(POLLY_LINK_LIBS)
     foreach(lib ${POLLY_LINK_LIBS})
       target_link_libraries(${name} ${lib})
     endforeach(lib)
   endif(POLLY_LINK_LIBS)
 
   if( LLVM_LINK_COMPONENTS )
     llvm_config(${name} ${LLVM_LINK_COMPONENTS})
   endif( LLVM_LINK_COMPONENTS )
+  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)
 
 macro(add_polly_loadable_module name)
   set(srcs ${ARGN})
   # klduge: pass different values for MODULE with multiple targets in same dir
   # this allows building shared-lib and module in same dir
   # there must be a cleaner way to achieve this....