Skip to content

Commit 5c12506

Browse files
author
Doug Coleman
committed
[cmake]: Second try at making swift-api-digester work correctly.
Note: I ran into an issue compiling on Linux with STL 4.8 headers where STL vector needs an iterator instead of a ``const_iterator``. Hopefully this will not show on the CI machines. http://stackoverflow.com/questions/19559235/missing-const-iterator-overload-of-stdvectorerase-with-g-4-8
1 parent 498c5a9 commit 5c12506

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

test/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ function(get_test_dependencies SDK result_var_name)
4141

4242
set(deps_binaries
4343
swift swift-ide-test sil-opt swift-llvm-opt swift-demangle sil-extract
44-
lldb-moduleimport-test swift-reflection-dump swift-remoteast-test)
44+
lldb-moduleimport-test swift-reflection-dump swift-remoteast-test
45+
swift-api-digester)
4546
if(NOT SWIFT_BUILT_STANDALONE)
4647
list(APPEND deps_binaries FileCheck arcmt-test c-arcmt-test c-index-test
4748
clang llc llvm-cov llvm-dwarfdump llvm-link llvm-profdata not)

tools/CMakeLists.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,12 @@ add_swift_tool_subdirectory(swift-demangle)
66
add_swift_tool_subdirectory(lldb-moduleimport-test)
77
add_swift_tool_subdirectory(sil-extract)
88
add_swift_tool_subdirectory(swift-llvm-opt)
9-
10-
if(SWIFT_HOST_VARIANT STREQUAL "macosx")
11-
# Only build Darwin-specific tools when deploying to OS X.
12-
add_swift_tool_subdirectory(swift-api-digester)
13-
endif()
9+
add_swift_tool_subdirectory(swift-api-digester)
1410

1511
if(SWIFT_BUILD_SOURCEKIT)
1612
add_swift_tool_subdirectory(SourceKit)
1713
endif()
1814

19-
2015
is_sdk_requested("${SWIFT_HOST_VARIANT_SDK}" SWIFT_HOST_SDK_REQUESTED)
2116
if(SWIFT_BUILD_STDLIB AND SWIFT_HOST_SDK_REQUESTED)
2217
add_swift_tool_subdirectory(swift-reflection-dump)
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
add_swift_executable(swift-api-digester
1+
add_swift_host_tool(swift-api-digester
22
swift-api-digester.cpp
3-
LINK_LIBRARIES
4-
swiftFrontend swiftIDE
3+
LINK_LIBRARIES swiftFrontend swiftIDE
4+
SWIFT_COMPONENT tools
55
)

0 commit comments

Comments
 (0)