Skip to content

Commit e96c98f

Browse files
committedMay 8, 2019
[CMake] Install import libraries
Simplify the cmake logic to install both runtime and import libraries (treated as ARCHIVE), as the later are needed to link against llvm. Patch by Julien Schueller! Differential Revision: https://reviews.llvm.org/D61425 llvm-svn: 360230
1 parent 5f7c861 commit e96c98f

File tree

1 file changed

+3
-16
lines changed

1 file changed

+3
-16
lines changed
 

‎llvm/cmake/modules/AddLLVM.cmake

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -671,21 +671,6 @@ macro(add_llvm_library name)
671671
if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LTO" OR
672672
${name} STREQUAL "Remarks" OR
673673
(LLVM_LINK_LLVM_DYLIB AND ${name} STREQUAL "LLVM"))
674-
set(install_dir lib${LLVM_LIBDIR_SUFFIX})
675-
if(ARG_MODULE OR ARG_SHARED OR BUILD_SHARED_LIBS)
676-
if(WIN32 OR CYGWIN OR MINGW)
677-
set(install_type RUNTIME)
678-
set(install_dir bin)
679-
else()
680-
set(install_type LIBRARY)
681-
endif()
682-
else()
683-
set(install_type ARCHIVE)
684-
endif()
685-
686-
if (ARG_MODULE)
687-
set(install_type LIBRARY)
688-
endif()
689674

690675
set(export_to_llvmexports)
691676
if(${name} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR
@@ -697,7 +682,9 @@ macro(add_llvm_library name)
697682

698683
install(TARGETS ${name}
699684
${export_to_llvmexports}
700-
${install_type} DESTINATION ${install_dir}
685+
LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
686+
ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}
687+
RUNTIME DESTINATION bin
701688
COMPONENT ${name})
702689

703690
if (NOT LLVM_ENABLE_IDE)

0 commit comments

Comments
 (0)
Please sign in to comment.