Merge pull request #991 from CodaFi/unmake-yourself

Author: CodaFi

CMakeLists.txt

@@ -8,6 +8,8 @@
 
 cmake_minimum_required(VERSION 3.19.6)
 
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
+
 project(SwiftSyntax LANGUAGES C Swift)
 
 set(SWIFT_VERSION 5)
@@ -27,3 +29,5 @@ export(EXPORT SwiftSyntaxTargets
        FILE "${CMAKE_CURRENT_BINARY_DIR}/cmake/SwiftSyntaxTargets.cmake"
        NAMESPACE SwiftSyntax::
 )
+
+add_subdirectory(cmake/modules)

Sources/SwiftParser/CMakeLists.txt

@@ -52,7 +52,7 @@ 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} ${CMAKE_CURRENT_SOURCE_DIR}")
+  "${CMAKE_Swift_MODULE_DIRECTORY}")
 
 install(TARGETS SwiftParser
   EXPORT SwiftSyntaxTargets

cmake/modules/CMakeLists.txt

@@ -0,0 +1,4 @@
+get_property(SWIFTSYNTAX_EXPORTS GLOBAL PROPERTY SWIFTSYNTAX_EXPORTS) 
+export(TARGETS ${SWIFTSYNTAX_EXPORTS} 
+       FILE ${CMAKE_CURRENT_BINARY_DIR}/SwiftSyntaxConfig.cmake
+       NAMESPACE SwiftSyntax::)