Skip to content

Commit 267ac5e

Browse files
authored
Merge pull request #665 from DougGregor/cmake-export
2 parents 5a02df8 + ab83402 commit 267ac5e

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
2222
set(CMAKE_MACOSX_RPATH YES)
2323

2424
add_subdirectory(Sources)
25+
26+
export(EXPORT SwiftSyntaxTargets
27+
FILE "${CMAKE_CURRENT_BINARY_DIR}/cmake/SwiftSyntaxTargets.cmake"
28+
NAMESPACE SwiftSyntax::
29+
)

Sources/SwiftDiagnostics/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ set_target_properties(SwiftDiagnostics PROPERTIES
2222
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
2323

2424
install(TARGETS SwiftDiagnostics
25+
EXPORT SwiftSyntaxTargets
2526
ARCHIVE DESTINATION lib
2627
LIBRARY DESTINATION lib
2728
RUNTIME DESTINATION bin)

Sources/SwiftParser/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,12 @@ target_link_libraries(SwiftParser PUBLIC
3737

3838
set_property(GLOBAL APPEND PROPERTY SWIFTSYNTAX_EXPORTS SwiftParser)
3939

40-
# Rename the installed library to avoid clashing with the C++
41-
# "libswiftParser" on case-insensitive file systems.
42-
set_target_properties(SwiftParser PROPERTIES OUTPUT_NAME "SwiftSwiftParser")
43-
4440
# NOTE: workaround for CMake not setting up include flags yet
4541
set_target_properties(SwiftParser PROPERTIES
4642
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
4743

4844
install(TARGETS SwiftParser
45+
EXPORT SwiftSyntaxTargets
4946
ARCHIVE DESTINATION lib
5047
LIBRARY DESTINATION lib
5148
RUNTIME DESTINATION bin)

Sources/SwiftSyntax/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ set_target_properties(SwiftSyntax PROPERTIES
6262
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
6363

6464
install(TARGETS SwiftSyntax
65+
EXPORT SwiftSyntaxTargets
6566
ARCHIVE DESTINATION lib
6667
LIBRARY DESTINATION lib
6768
RUNTIME DESTINATION bin)

0 commit comments

Comments
 (0)