[llvm] r360230 - [CMake] Install import libraries
Martin Storsjo via llvm-commits
llvm-commits at lists.llvm.org
Wed May 8 01:37:34 PDT 2019
Author: mstorsjo
Date: Wed May 8 01:37:34 2019
New Revision: 360230
URL: http://llvm.org/viewvc/llvm-project?rev=360230&view=rev
Log:
[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
Modified:
llvm/trunk/cmake/modules/AddLLVM.cmake
Modified: llvm/trunk/cmake/modules/AddLLVM.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddLLVM.cmake?rev=360230&r1=360229&r2=360230&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/AddLLVM.cmake (original)
+++ llvm/trunk/cmake/modules/AddLLVM.cmake Wed May 8 01:37:34 2019
@@ -671,21 +671,6 @@ macro(add_llvm_library name)
if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LTO" OR
${name} STREQUAL "Remarks" OR
(LLVM_LINK_LLVM_DYLIB AND ${name} STREQUAL "LLVM"))
- set(install_dir lib${LLVM_LIBDIR_SUFFIX})
- if(ARG_MODULE OR ARG_SHARED OR BUILD_SHARED_LIBS)
- if(WIN32 OR CYGWIN OR MINGW)
- set(install_type RUNTIME)
- set(install_dir bin)
- else()
- set(install_type LIBRARY)
- endif()
- else()
- set(install_type ARCHIVE)
- endif()
-
- if (ARG_MODULE)
- set(install_type LIBRARY)
- endif()
set(export_to_llvmexports)
if(${name} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR
@@ -697,7 +682,9 @@ macro(add_llvm_library name)
install(TARGETS ${name}
${export_to_llvmexports}
- ${install_type} DESTINATION ${install_dir}
+ LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
+ ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}
+ RUNTIME DESTINATION bin
COMPONENT ${name})
if (NOT LLVM_ENABLE_IDE)
More information about the llvm-commits
mailing list