File clang-split-static-library-exports-into-their-o... of Package llvm5

Overview Repositories Revisions Requests Users Attributes Meta

File clang-split-static-library-exports-into-their-own-export-file.diff of Package llvm5 (Revision 32336af3a7120087e4b0919541dd78c7)

Currently displaying revision 32336af3a7120087e4b0919541dd78c7 , Show latest

Index: cfe-5.0.0.src/cmake/modules/AddClang.cmake
===================================================================
--- cfe-5.0.0.src.orig/cmake/modules/AddClang.cmake
+++ cfe-5.0.0.src/cmake/modules/AddClang.cmake
@@ -92,7 +92,11 @@ macro(add_clang_library name)
 
       if(${name} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR
           NOT LLVM_DISTRIBUTION_COMPONENTS)
-        set(export_to_clangtargets EXPORT ClangTargets)
+        if(ARG_SHARED)
+          set(export_to_clangtargets EXPORT ClangTargets)
+        else()
+          set(export_to_clangtargets EXPORT ClangStaticTargets)
+        endif()
         set_property(GLOBAL PROPERTY CLANG_HAS_EXPORTS True)
       endif()
 
Index: cfe-5.0.0.src/cmake/modules/CMakeLists.txt
===================================================================
--- cfe-5.0.0.src.orig/cmake/modules/CMakeLists.txt
+++ cfe-5.0.0.src/cmake/modules/CMakeLists.txt
@@ -15,6 +15,7 @@ export(TARGETS ${CLANG_EXPORTS} FILE ${c
 set(CLANG_CONFIG_CMAKE_DIR "${clang_cmake_builddir}")
 set(CLANG_CONFIG_LLVM_CMAKE_DIR "${llvm_cmake_builddir}")
 set(CLANG_CONFIG_EXPORTS_FILE "${clang_cmake_builddir}/ClangTargets.cmake")
+set(CLANG_CONFIG_STATIC_EXPORTS_FILE "${clang_cmake_builddir}/ClangStaticTargets.cmake")
 set(CLANG_CONFIG_INCLUDE_DIRS
   "${CLANG_SOURCE_DIR}/include"
   "${CLANG_BINARY_DIR}/include"
@@ -26,6 +27,7 @@ configure_file(
 set(CLANG_CONFIG_CMAKE_DIR)
 set(CLANG_CONFIG_LLVM_CMAKE_DIR)
 set(CLANG_CONFIG_EXPORTS_FILE)
+set(CLANG_CONFIG_STATIC_EXPORTS_FILE)
 
 # Generate ClangConfig.cmake for the install tree.
 set(CLANG_CONFIG_CODE "
@@ -41,6 +43,7 @@ endforeach(p)
 set(CLANG_CONFIG_CMAKE_DIR "\${CLANG_INSTALL_PREFIX}/${CLANG_INSTALL_PACKAGE_DIR}")
 set(CLANG_CONFIG_LLVM_CMAKE_DIR "\${CLANG_INSTALL_PREFIX}/${LLVM_INSTALL_PACKAGE_DIR}")
 set(CLANG_CONFIG_EXPORTS_FILE "\${CLANG_CMAKE_DIR}/ClangTargets.cmake")
+set(CLANG_CONFIG_STATIC_EXPORTS_FILE "\${CLANG_CMAKE_DIR}/ClangStaticTargets.cmake")
 set(CLANG_CONFIG_INCLUDE_DIRS
   "\${CLANG_INSTALL_PREFIX}/include"
   )
@@ -51,11 +54,13 @@ configure_file(
 set(CLANG_CONFIG_CODE)
 set(CLANG_CONFIG_CMAKE_DIR)
 set(CLANG_CONFIG_EXPORTS_FILE)
+set(CLANG_CONFIG_STATIC_EXPORTS_FILE)
 
 if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
   get_property(clang_has_exports GLOBAL PROPERTY CLANG_HAS_EXPORTS)
   if(clang_has_exports)
     install(EXPORT ClangTargets DESTINATION ${CLANG_INSTALL_PACKAGE_DIR})
+    install(EXPORT ClangStaticTargets DESTINATION ${CLANG_INSTALL_PACKAGE_DIR})
   endif()
 
   install(FILES
Index: cfe-5.0.0.src/cmake/modules/ClangConfig.cmake.in
===================================================================
--- cfe-5.0.0.src.orig/cmake/modules/ClangConfig.cmake.in
+++ cfe-5.0.0.src/cmake/modules/ClangConfig.cmake.in
@@ -11,3 +11,4 @@ set(CLANG_INCLUDE_DIRS "@CLANG_CONFIG_IN
 
 # Provide all our library targets to users.
 include("@CLANG_CONFIG_EXPORTS_FILE@")
+include("@CLANG_CONFIG_STATIC_EXPORTS_FILE@" OPTIONAL)

Places

File clang-split-static-library-exports-into-their-own-export-file.diff of Package llvm5 (Revision 32336af3a7120087e4b0919541dd78c7)

Places