Skip to content

Introduce and use SWIFT_HAVE_LIBEDIT #6459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 22, 2016
Merged

Introduce and use SWIFT_HAVE_LIBEDIT #6459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ set_property(GLOBAL PROPERTY JOB_POOL_LINK local_jobs)

# First include general CMake utilities.
include(SwiftUtils)
include(CheckSymbolExists)

#
# User-configurable options that control the inclusion and default build
Expand Down Expand Up @@ -805,6 +806,8 @@ if(LIBXML2_FOUND)
set(SWIFT_HAVE_LIBXML 1)
endif()

check_symbol_exists(el_wgets "histedit.h" HAVE_UNICODE_LIBEDIT)

if (LLVM_ENABLE_DOXYGEN)
message(STATUS "Doxygen: enabled")
endif()
Expand Down
4 changes: 0 additions & 4 deletions include/swift/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
include(CheckSymbolExists)

check_symbol_exists(el_wgets "histedit.h" HAVE_UNICODE_LIBEDIT)

configure_file(Config.h.in ${CMAKE_CURRENT_BINARY_DIR}/Config.h
ESCAPE_QUOTES @ONLY)

Expand Down
4 changes: 3 additions & 1 deletion tools/SourceKit/tools/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,7 @@ include_directories(

add_swift_lib_subdirectory(sourcekitd)
add_swift_tool_subdirectory(sourcekitd-test)
add_swift_tool_subdirectory(sourcekitd-repl)
if(HAVE_UNICODE_LIBEDIT)
add_swift_tool_subdirectory(sourcekitd-repl)
endif()
add_swift_tool_subdirectory(complete-test)
4 changes: 3 additions & 1 deletion tools/driver/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ add_swift_host_tool(swift
SWIFT_COMPONENT compiler
)

target_link_libraries(swift edit)
if(HAVE_UNICODE_LIBEDIT)
target_link_libraries(swift edit)
endif()

add_custom_command(TARGET swift POST_BUILD
COMMAND "${CMAKE_COMMAND}" "-E" "create_symlink" "swift" "swiftc"
Expand Down
4 changes: 3 additions & 1 deletion tools/swift-remoteast-test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ add_swift_host_tool(swift-remoteast-test
)

set_target_properties(swift-remoteast-test PROPERTIES ENABLE_EXPORTS 1)
target_link_libraries(swift-remoteast-test edit)
if(HAVE_UNICODE_LIBEDIT)
target_link_libraries(swift-remoteast-test edit)
endif()

# If building as part of clang, make sure the headers are installed.
if(NOT SWIFT_BUILT_STANDALONE)
Expand Down