[CMake] Introduce add_swift_host_library and use it for all libraries.

DougGregor · DougGregor · commit 8ac6d59543c7 · 2022-11-30T13:55:19.000-08:00
There was a lot of CMake code repeated across the various libraries.
Consolidate that into a new `add_swift_host_library` and use it
throughout.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -23,6 +23,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
 set(CMAKE_MACOSX_RPATH YES)
 
+include(AddSwiftHostLibrary)
+
 # Ensure that we do not link the _StringProcessing module. But we can
 # only pass this flag for new-enough compilers that support it.
 file(WRITE "${CMAKE_BINARY_DIR}/tmp/empty-check-string-processing.swift" "")
diff --git a/Sources/IDEUtils/CMakeLists.txt b/Sources/IDEUtils/CMakeLists.txt
@@ -6,23 +6,11 @@
 # See http://swift.org/LICENSE.txt for license information
 # See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
-add_library(IDEUtils
+add_swift_host_library(IDEUtils
   gyb_generated/SyntaxClassification.swift
   Syntax+Classifications.swift
   SyntaxClassifier.swift
 )
 
 target_link_libraries(IDEUtils PUBLIC
   SwiftSyntax)
-
-set_property(GLOBAL APPEND PROPERTY SWIFTSYNTAX_EXPORTS IDEUtils)
-
-# NOTE: workaround for CMake not setting up include flags yet
-set_target_properties(IDEUtils PROPERTIES
-  INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
-
-install(TARGETS IDEUtils
-  EXPORT SwiftSyntaxTargets
-  ARCHIVE DESTINATION lib
-  LIBRARY DESTINATION lib
-  RUNTIME DESTINATION bin)
diff --git a/Sources/SwiftBasicFormat/CMakeLists.txt b/Sources/SwiftBasicFormat/CMakeLists.txt
@@ -6,23 +6,11 @@
 # See http://swift.org/LICENSE.txt for license information
 # See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
-add_library(SwiftBasicFormat
+add_swift_host_library(SwiftBasicFormat
   generated/BasicFormat.swift
   SyntaxProtocol+Formatted.swift
   Trivia+Indented.swift
 )
 
 target_link_libraries(SwiftBasicFormat PUBLIC
   SwiftSyntax)
-
-set_property(GLOBAL APPEND PROPERTY SWIFTSYNTAX_EXPORTS SwiftBasicFormat)
-
-# NOTE: workaround for CMake not setting up include flags yet
-set_target_properties(SwiftBasicFormat PROPERTIES
-  INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
-
-install(TARGETS SwiftBasicFormat
-  EXPORT SwiftSyntaxTargets
-  ARCHIVE DESTINATION lib
-  LIBRARY DESTINATION lib
-  RUNTIME DESTINATION bin)
diff --git a/Sources/SwiftCompilerSupport/CMakeLists.txt b/Sources/SwiftCompilerSupport/CMakeLists.txt
@@ -6,7 +6,7 @@
 # See http://swift.org/LICENSE.txt for license information
 # See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
-add_library(SwiftCompilerSupport
+add_swift_host_library(SwiftCompilerSupport
   ConsistencyCheck.swift
 )
 
@@ -17,16 +17,3 @@ target_link_libraries(SwiftCompilerSupport PUBLIC
   SwiftParserDiagnostics
   SwiftOperators
 )
-
-set_property(GLOBAL APPEND PROPERTY SWIFTSYNTAX_EXPORTS SwiftCompilerSupport)
-
-# NOTE: workaround for CMake not setting up include flags yet
-set_target_properties(SwiftCompilerSupport PROPERTIES
-  INTERFACE_INCLUDE_DIRECTORIES
-  "${CMAKE_Swift_MODULE_DIRECTORY} ${CMAKE_CURRENT_SOURCE_DIR}")
-
-install(TARGETS SwiftCompilerSupport
-  EXPORT SwiftSyntaxTargets
-  ARCHIVE DESTINATION lib
-  LIBRARY DESTINATION lib
-  RUNTIME DESTINATION bin)
diff --git a/Sources/SwiftDiagnostics/CMakeLists.txt b/Sources/SwiftDiagnostics/CMakeLists.txt
@@ -6,7 +6,7 @@
 # See http://swift.org/LICENSE.txt for license information
 # See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
-add_library(SwiftDiagnostics
+add_swift_host_library(SwiftDiagnostics
   Diagnostic.swift
   DiagnosticsFormatter.swift
   FixIt.swift
@@ -16,15 +16,3 @@ add_library(SwiftDiagnostics
 
 target_link_libraries(SwiftDiagnostics PUBLIC
   SwiftSyntax)
-
-set_property(GLOBAL APPEND PROPERTY SWIFTSYNTAX_EXPORTS SwiftDiagnostics)
-
-# NOTE: workaround for CMake not setting up include flags yet
-set_target_properties(SwiftDiagnostics PROPERTIES
-  INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
-
-install(TARGETS SwiftDiagnostics
-  EXPORT SwiftSyntaxTargets
-  ARCHIVE DESTINATION lib
-  LIBRARY DESTINATION lib
-  RUNTIME DESTINATION bin)
diff --git a/Sources/SwiftOperators/CMakeLists.txt b/Sources/SwiftOperators/CMakeLists.txt
@@ -6,7 +6,7 @@
 # See http://swift.org/LICENSE.txt for license information
 # See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
-add_library(SwiftOperators
+add_swift_host_library(SwiftOperators
   Operator.swift
   OperatorError+Diagnostics.swift
   OperatorError.swift
@@ -23,16 +23,3 @@ target_link_libraries(SwiftOperators PUBLIC
   SwiftSyntax
   SwiftDiagnostics
   SwiftParser)
-
-set_property(GLOBAL APPEND PROPERTY SWIFTSYNTAX_EXPORTS SwiftOperators)
-
-# NOTE: workaround for CMake not setting up include flags yet
-set_target_properties(SwiftOperators PROPERTIES
-  INTERFACE_INCLUDE_DIRECTORIES
-  "${CMAKE_Swift_MODULE_DIRECTORY} ${CMAKE_CURRENT_SOURCE_DIR}")
-
-install(TARGETS SwiftOperators
-  EXPORT SwiftSyntaxTargets
-  ARCHIVE DESTINATION lib
-  LIBRARY DESTINATION lib
-  RUNTIME DESTINATION bin)
diff --git a/Sources/SwiftParser/CMakeLists.txt b/Sources/SwiftParser/CMakeLists.txt
@@ -6,7 +6,7 @@
 # See http://swift.org/LICENSE.txt for license information
 # See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
-add_library(SwiftParser
+add_swift_host_library(SwiftParser
   Attributes.swift
   Availability.swift
   CharacterInfo.swift
@@ -40,16 +40,3 @@ add_library(SwiftParser
 target_link_libraries(SwiftParser PUBLIC
   SwiftSyntax
   SwiftDiagnostics)
-
-set_property(GLOBAL APPEND PROPERTY SWIFTSYNTAX_EXPORTS SwiftParser)
-
-# NOTE: workaround for CMake not setting up include flags yet
-set_target_properties(SwiftParser PROPERTIES
-  INTERFACE_INCLUDE_DIRECTORIES
-  "${CMAKE_Swift_MODULE_DIRECTORY}")
-
-install(TARGETS SwiftParser
-  EXPORT SwiftSyntaxTargets
-  ARCHIVE DESTINATION lib
-  LIBRARY DESTINATION lib
-  RUNTIME DESTINATION bin)
diff --git a/Sources/SwiftParserDiagnostics/CMakeLists.txt b/Sources/SwiftParserDiagnostics/CMakeLists.txt
@@ -6,7 +6,7 @@
 # See http://swift.org/LICENSE.txt for license information
 # See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
-add_library(SwiftParserDiagnostics
+add_swift_host_library(SwiftParserDiagnostics
   DiagnosticExtensions.swift
   MissingNodesError.swift
   ParserDiagnosticMessages.swift
@@ -20,16 +20,3 @@ target_link_libraries(SwiftParserDiagnostics PUBLIC
   SwiftDiagnostics
   SwiftParser
   SwiftSyntax)
-
-set_property(GLOBAL APPEND PROPERTY SWIFTSYNTAX_EXPORTS SwiftParserDiagnostics)
-
-# NOTE: workaround for CMake not setting up include flags yet
-set_target_properties(SwiftParserDiagnostics PROPERTIES
-  INTERFACE_INCLUDE_DIRECTORIES
-  "${CMAKE_Swift_MODULE_DIRECTORY} ${CMAKE_CURRENT_SOURCE_DIR}")
-
-install(TARGETS SwiftParserDiagnostics
-  EXPORT SwiftSyntaxTargets
-  ARCHIVE DESTINATION lib
-  LIBRARY DESTINATION lib
-  RUNTIME DESTINATION bin)
diff --git a/Sources/SwiftSyntax/CMakeLists.txt b/Sources/SwiftSyntax/CMakeLists.txt
@@ -6,7 +6,7 @@
 # See http://swift.org/LICENSE.txt for license information
 # See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
-add_library(SwiftSyntax
+add_swift_host_library(SwiftSyntax
   AbsolutePosition.swift
   BumpPtrAllocator.swift
   CommonAncestor.swift
@@ -54,15 +54,3 @@ add_library(SwiftSyntax
   gyb_generated/syntax_nodes/SyntaxStmtNodes.swift
   gyb_generated/syntax_nodes/SyntaxTypeNodes.swift
 )
-
-set_property(GLOBAL APPEND PROPERTY SWIFTSYNTAX_EXPORTS SwiftSyntax)
-
-# NOTE: workaround for CMake not setting up include flags yet
-set_target_properties(SwiftSyntax PROPERTIES
-  INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
-
-install(TARGETS SwiftSyntax
-  EXPORT SwiftSyntaxTargets
-  ARCHIVE DESTINATION lib
-  LIBRARY DESTINATION lib
-  RUNTIME DESTINATION bin)
diff --git a/Sources/SwiftSyntaxBuilder/CMakeLists.txt b/Sources/SwiftSyntaxBuilder/CMakeLists.txt
@@ -6,7 +6,7 @@
 # See http://swift.org/LICENSE.txt for license information
 # See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
-add_library(SwiftSyntaxBuilder
+add_swift_host_library(SwiftSyntaxBuilder
   ConvenienceInitializers.swift
   HasTrailingComma.swift
   Indenter.swift
@@ -29,16 +29,3 @@ target_link_libraries(SwiftSyntaxBuilder PUBLIC
   SwiftParserDiagnostics
   SwiftSyntax
   )
-
-set_property(GLOBAL APPEND PROPERTY SWIFTSYNTAX_EXPORTS SwiftSyntaxBuilder)
-
-# NOTE: workaround for CMake not setting up include flags yet
-set_target_properties(SwiftSyntaxBuilder PROPERTIES
-  INTERFACE_INCLUDE_DIRECTORIES
-  "${CMAKE_Swift_MODULE_DIRECTORY} ${CMAKE_CURRENT_SOURCE_DIR}")
-
-install(TARGETS SwiftSyntaxBuilder
-  EXPORT SwiftSyntaxTargets
-  ARCHIVE DESTINATION lib
-  LIBRARY DESTINATION lib
-  RUNTIME DESTINATION bin)
diff --git a/Sources/_SwiftSyntaxMacros/CMakeLists.txt b/Sources/_SwiftSyntaxMacros/CMakeLists.txt
@@ -6,7 +6,7 @@
 # See http://swift.org/LICENSE.txt for license information
 # See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
-add_library(_SwiftSyntaxMacros
+add_swift_host_library(_SwiftSyntaxMacros
   ExpressionMacro.swift
   Macro.swift
   MacroEvaluationContext.swift
@@ -21,16 +21,3 @@ target_link_libraries(_SwiftSyntaxMacros PUBLIC
   SwiftParser
   SwiftSyntaxBuilder
   )
-
-set_property(GLOBAL APPEND PROPERTY SWIFTSYNTAX_EXPORTS _SwiftSyntaxMacros)
-
-# NOTE: workaround for CMake not setting up include flags yet
-set_target_properties(_SwiftSyntaxMacros PROPERTIES
-  INTERFACE_INCLUDE_DIRECTORIES
-  "${CMAKE_Swift_MODULE_DIRECTORY} ${CMAKE_CURRENT_SOURCE_DIR}")
-
-install(TARGETS _SwiftSyntaxMacros
-  EXPORT SwiftSyntaxTargets
-  ARCHIVE DESTINATION lib
-  LIBRARY DESTINATION lib
-  RUNTIME DESTINATION bin)
diff --git a/cmake/modules/AddSwiftHostLibrary.cmake b/cmake/modules/AddSwiftHostLibrary.cmake
@@ -0,0 +1,29 @@
+# This source file is part of the Swift.org open source project
+#
+# Copyright (c) 2014 - 2022 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See http://swift.org/LICENSE.txt for license information
+# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+
+# Add a new host library with the given name.
+function(add_swift_host_library name)
+  set(ASHL_SOURCES ${ARGN})
+
+  add_library(${name} ${ASHL_SOURCES})
+
+  # Add this to the list of exported targets.
+  set_property(GLOBAL APPEND PROPERTY SWIFTSYNTAX_EXPORTS ${name})
+
+  # NOTE: workaround for CMake not setting up include flags yet
+  set_target_properties(${name} PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
+
+  # Install this target
+  install(TARGETS ${name}
+    EXPORT SwiftSyntaxTargets
+    ARCHIVE DESTINATION lib
+    LIBRARY DESTINATION lib
+    RUNTIME DESTINATION bin
+  )
+endfunction()
