Revert "[CMake] Fix up and fill out swift exports."

cmake/modules/AddSwift.cmake

@@ -1506,22 +1506,19 @@ function(add_swift_host_library name)
     INSTALL_IN_COMPONENT "dev"
     )
 
-  swift_is_installing_component(dev is_installing)
-  if(NOT is_installing)
-    set_property(GLOBAL APPEND PROPERTY SWIFT_BUILDTREE_EXPORTS ${name})
-  elseif(NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
-    set(export_to_swiftexports EXPORT SwiftExports)
-    set_property(GLOBAL PROPERTY SWIFT_HAS_EXPORTS True)
-    set_property(GLOBAL APPEND PROPERTY SWIFT_EXPORTS ${name})
-  endif()
-
   if(NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
-    swift_install_in_component(TARGETS ${name} ${export_to_swiftexports}
+    swift_install_in_component(TARGETS ${name}
       ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT dev
       LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT dev
       RUNTIME DESTINATION bin COMPONENT dev)
   endif()
 
+  swift_is_installing_component(dev is_installing)
+  if(NOT is_installing)
+    set_property(GLOBAL APPEND PROPERTY SWIFT_BUILDTREE_EXPORTS ${name})
+  else()
+    set_property(GLOBAL APPEND PROPERTY SWIFT_EXPORTS ${name})
+  endif()
 endfunction()
 
 # Add a new Swift target library.
@@ -2120,16 +2117,7 @@ function(add_swift_target_library name)
       endif()
 
       if(sdk STREQUAL WINDOWS AND CMAKE_SYSTEM_NAME STREQUAL Windows)
-        set(target_name ${name}-windows-${SWIFT_PRIMARY_VARIANT_ARCH})
-        swift_is_installing_component("${SWIFTLIB_INSTALL_IN_COMPONENT}" is_installing)
-        if(NOT is_installing)
-          set_property(GLOBAL APPEND PROPERTY SWIFT_BUILDTREE_EXPORTS ${target_name})
-        else(NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
-          set(export_to_swiftexports EXPORT SwiftExports)
-          set_property(GLOBAL PROPERTY SWIFT_HAS_EXPORTS True)
-          set_property(GLOBAL APPEND PROPERTY SWIFT_EXPORTS ${target_name})
-        endif()
-        swift_install_in_component(TARGETS ${target_name} ${export_to_swiftexports}
+        swift_install_in_component(TARGETS ${name}-windows-${SWIFT_PRIMARY_VARIANT_ARCH}
                                    RUNTIME
                                      DESTINATION "bin"
                                      COMPONENT "${SWIFTLIB_INSTALL_IN_COMPONENT}"
@@ -2171,7 +2159,6 @@ function(add_swift_target_library name)
         endif()
 
         if(is_installing)
-          set_property(GLOBAL PROPERTY SWIFT_HAS_EXPORTS True)
           set_property(GLOBAL APPEND
             PROPERTY SWIFT_EXPORTS ${_variant_name})
         else()
@@ -2419,22 +2406,18 @@ function(add_swift_host_tool executable)
     ARCHITECTURE ${SWIFT_HOST_VARIANT_ARCH}
     ${ASHT_UNPARSED_ARGUMENTS})
 
+  swift_install_in_component(TARGETS ${executable}
+                             RUNTIME
+                               DESTINATION bin
+                               COMPONENT ${ASHT_SWIFT_COMPONENT})
+
   swift_is_installing_component(${ASHT_SWIFT_COMPONENT} is_installing)
 
   if(NOT is_installing)
     set_property(GLOBAL APPEND PROPERTY SWIFT_BUILDTREE_EXPORTS ${executable})
   else()
-    set(export_to_swiftexports EXPORT SwiftExports)
-    set_property(GLOBAL PROPERTY SWIFT_HAS_EXPORTS True)
     set_property(GLOBAL APPEND PROPERTY SWIFT_EXPORTS ${executable})
   endif()
-
-  swift_install_in_component(TARGETS ${executable} ${export_to_swiftexports}
-                             RUNTIME
-                               DESTINATION bin
-                               COMPONENT ${ASHT_SWIFT_COMPONENT})
-
-
 endfunction()
 
 # This declares a swift host tool that links with libfuzzer.

cmake/modules/CMakeLists.txt

@@ -1,66 +1,19 @@
 set(SWIFT_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/swift)
 set(swift_cmake_builddir "${SWIFT_BINARY_DIR}/${SWIFT_INSTALL_PACKAGE_DIR}")
 
-# Exports for those who want to build against an installed Swift
-set(SWIFT_EXPORTS_FILE "${swift_cmake_builddir}/SwiftExports.cmake")
+# Generate build-tree exports list only
+set(SWIFT_EXPORTS_FILE ${swift_cmake_builddir}/SwiftExports.cmake)
 get_property(SWIFT_EXPORTS GLOBAL PROPERTY SWIFT_EXPORTS)
-export(TARGETS ${SWIFT_EXPORTS} FILE ${SWIFT_EXPORTS_FILE})
-
-# Export targets that are only available when building against a Swift build
-# tree
-set(SWIFT_BUILDTREE_EXPORTS_FILE "${swift_cmake_builddir}/SwiftBuildTreeExports.cmake")
 get_property(SWIFT_BUILDTREE_EXPORTS GLOBAL PROPERTY SWIFT_BUILDTREE_EXPORTS)
-export(TARGETS ${SWIFT_BUILDTREE_EXPORTS} FILE ${SWIFT_BUILDTREE_EXPORTS_FILE})
 
-# Generate SwiftConfig.cmake for the build tree
-set(SWIFT_CONFIG_EXPORTS "${SWIFT_EXPORTS};${SWIFT_BUILDTREE_EXPORTS}")
-set(SWIFT_CONFIG_EXPORTS_FILE "${SWIFT_EXPORTS_FILE}")
-set(SWIFT_CONFIG_BINARY_DIR "${SWIFT_BINARY_DIR}")
-set(SWIFT_CONFIG_INCLUDE_DIRS
-  "${SWIFT_INCLUDE_DIR}"
-  "${SWIFT_MAIN_INCLUDE_DIR}"
-)
-set(SWIFT_CONFIG_INCLUDE_DIR "${SWIFT_INCLUDE_DIR}")
-set(SWIFT_CONFIG_LIBRARY_DIRS "${SWIFT_LIBRARY_OUTPUT_INTDIR}")
-set(SWIFT_CONFIG_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
-set(swift_config_include_buildtree_exports
-"include(\"${SWIFT_BUILDTREE_EXPORTS_FILE}\")")
+set(SWIFT_CONFIG_EXPORTS ${SWIFT_EXPORTS} ${SWIFT_BUILDTREE_EXPORTS})
+export(TARGETS ${SWIFT_CONFIG_EXPORTS} FILE ${SWIFT_EXPORTS_FILE})
 
-configure_file(
-  SwiftConfig.cmake.in
-  ${swift_cmake_builddir}/SwiftConfig.cmake
-  @ONLY)
-set(swift_config_include_buildtree_exports)
 
-# Generate SwiftConfig.cmake for the install tree
-set(SWIFT_CONFIG_CODE
-"# Compute the installation prefix from this SwiftConfig.cmake location.
-get_filename_component(SWIFT_INSTALL_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)")
-# Construct the proper number of get_filename_component(... PATH)
-# calls to compute the installation prefix.
-file(TO_CMAKE_PATH "${SWIFT_INSTALL_PACKAGE_DIR}" SWIFT_INSTALL_PACKAGE_DIR)
-string(REGEX REPLACE "/" ";" _count "${SWIFT_INSTALL_PACKAGE_DIR}")
-foreach(p ${_count})
-  set(SWIFT_CONFIG_CODE "${SWIFT_CONFIG_CODE}
-get_filename_component(SWIFT_INSTALL_PREFIX \"\${SWIFT_INSTALL_PREFIX}\" PATH)")
-endforeach(p)
-set(SWIFT_CONFIG_BINARY_DIR "\${SWIFT_INSTALL_PREFIX}")
-set(SWIFT_CONFIG_CMAKE_DIR "\${SWIFT_INSTALL_PREFIX}/${SWIFT_INSTALL_PACKAGE_DIR}")
-set(SWIFT_CONFIG_EXPORTS "${SWIFT_EXPORTS}")
-set(SWIFT_CONFIG_EXPORTS_FILE "\${SWIFT_CMAKE_DIR}/SwiftExports.cmake")
-set(SWIFT_CONFIG_INCLUDE_DIRS "\${SWIFT_INSTALL_PREFIX}/include")
-set(SWIFT_CONFIG_LIBRARY_DIRS "\${SWIFT_INSTALL_PREFIX}/lib\${LLVM_LIBDIR_SUFFIX}")
+set(SWIFT_INCLUDE_DIRS ${SWIFT_INCLUDE_DIR} ${SWIFT_MAIN_INCLUDE_DIR})
+set(SWIFT_LIBRARY_DIRS ${SWIFT_LIBRARY_OUTPUT_INTDIR})
+
 configure_file(
   SwiftConfig.cmake.in
-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/SwiftConfig.cmake
-  @ONLY)
-
-if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
-  get_property(swift_has_exports GLOBAL PROPERTY SWIFT_HAS_EXPORTS)
-  if(swift_has_exports)
-    install(EXPORT SwiftExports DESTINATION ${SWIFT_INSTALL_PACKAGE_DIR})
-  endif()
-  install(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/SwiftConfig.cmake
-    DESTINATION ${SWIFT_INSTALL_PACKAGE_DIR})
-endif()
+  ${swift_cmake_builddir}/SwiftConfig.cmake
+  @ONLY)

cmake/modules/SwiftConfig.cmake.in

@@ -5,17 +5,17 @@
 set(SWIFT_VERSION @SWIFT_VERSION@)
 set(SWIFT_MAIN_SRC_DIR @SWIFT_SOURCE_DIR@)
 
-set(SWIFT_INCLUDE_DIRS "@SWIFT_CONFIG_INCLUDE_DIRS@")
+set(SWIFT_INCLUDE_DIRS "@SWIFT_INCLUDE_DIRS@")
 set(SWIFT_LIBRARY_DIRS "@SWIFT_CONFIG_LIBRARY_DIRS@")
 
 # These variables are duplicated, but they must match the LLVM variables of the
 # same name. The variables ending in "S" could some day become lists, and are
 # preserved for convention and compatibility.
-set(SWIFT_INCLUDE_DIR "@SWIFT_CONFIG_INCLUDE_DIRS@")
+set(SWIFT_INCLUDE_DIR "@SWIFT_INCLUDE_DIRS@")
 set(SWIFT_LIBRARY_DIR "@SWIFT_CONFIG_LIBRARY_DIRS@")
 
-set(SWIFT_CMAKE_DIR "@SWIFT_CONFIG_CMAKE_DIR@")
-set(SWIFT_BINARY_DIR "@SWIFT_CONFIG_BINARY_DIR@")
+set(SWIFT_CMAKE_DIR "@SWIFT_CMAKE_DIR@")
+set(SWIFT_BINARY_DIR "@SWIFT_BINARY_DIR@")
 
 set(CMARK_TARGETS_FILE @SWIFT_PATH_TO_CMARK_BUILD@/src/CMarkExports.cmake)
 if(NOT TARGET libcmark_static AND EXISTS ${CMARK_TARGETS_FILE})
@@ -24,6 +24,5 @@ endif()
 
 if(NOT TARGET swift)
   set(SWIFT_EXPORTED_TARGETS "@SWIFT_CONFIG_EXPORTS@")
-  include("@SWIFT_CONFIG_EXPORTS_FILE@")
-  @swift_config_include_buildtree_exports@
+  include("@SWIFT_EXPORTS_FILE@")
 endif()