Don't link to curses library explicitly

LLVM build system has been fixed to pass down this linker flag automatically. Swift SVN r7048
dxc0829 · Aug 8, 2013 · 5a88513 · 5a88513
1 parent ac80171
commit 5a88513
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 14 deletions.
diff --git a/tools/sil-opt/CMakeLists.txt b/tools/sil-opt/CMakeLists.txt
@@ -8,7 +8,5 @@ find_library(CORE_FOUNDATION NAMES CoreFoundation)
 
 target_link_libraries(sil-opt edit ${CORE_FOUNDATION})
 
-target_link_libraries(sil-opt curses)
-
 install(TARGETS sil-opt
   RUNTIME DESTINATION bin)
diff --git a/tools/swift-demangle/CMakeLists.txt b/tools/swift-demangle/CMakeLists.txt
@@ -3,7 +3,5 @@ add_swift_executable(swift-demangle
   DEPENDS swiftBasic
   COMPONENT_DEPENDS support ${LLVM_TARGETS_TO_BUILD})
 
-target_link_libraries(swift-demangle curses)
-
 install(TARGETS swift-demangle
   RUNTIME DESTINATION bin)
diff --git a/tools/swift-demangle/Makefile b/tools/swift-demangle/Makefile
@@ -18,8 +18,7 @@ LINK_COMPONENTS := support
 USEDLIBS = swiftBasic.a
 
 LLVMLibsOptions :=     \
-  $(LLVMLibsOptions)   \
-  -lcurses
+  $(LLVMLibsOptions)
 
 include $(SWIFT_LEVEL)/Makefile
 
diff --git a/tools/swift-ide-test/CMakeLists.txt b/tools/swift-ide-test/CMakeLists.txt
@@ -8,8 +8,6 @@ if(HAVE_DARWIN_MODULES_SDK)
                    -DSWIFT_MODULE_CACHE_PATH="${SWIFT_MODULE_CACHE_PATH}" )
 endif()
 
-target_link_libraries(swift-ide-test curses)
-
 install(TARGETS swift-ide-test
   RUNTIME DESTINATION bin)
 
diff --git a/tools/swift/CMakeLists.txt b/tools/swift/CMakeLists.txt
@@ -17,7 +17,5 @@ if(HAVE_DARWIN_MODULES_SDK)
                    -DSWIFT_MODULE_CACHE_PATH="${SWIFT_MODULE_CACHE_PATH}" )
 endif()
 
-target_link_libraries(swift curses)
-
 install(TARGETS swift
   RUNTIME DESTINATION bin)
diff --git a/unittests/Basic/CMakeLists.txt b/unittests/Basic/CMakeLists.txt
@@ -2,4 +2,3 @@ add_swift_unittest(SwiftBasicTests
   SourceManager.cpp
   TreeScopedHashTableTests.cpp
   )
-target_link_libraries(SwiftBasicTests curses)
diff --git a/unittests/IDE/CMakeLists.txt b/unittests/IDE/CMakeLists.txt
@@ -2,7 +2,6 @@ add_swift_unittest(SwiftIDETests
   CodeCompletionToken.cpp
   )
 target_link_libraries(SwiftIDETests
-  curses
   swiftIDE
 )
 llvm_config(SwiftIDETests bitreader bitwriter support ${LLVM_TARGETS_TO_BUILD})
diff --git a/unittests/Parse/CMakeLists.txt b/unittests/Parse/CMakeLists.txt
@@ -5,5 +5,5 @@ add_swift_unittest(SwiftParseTests
 )
 
 target_link_libraries(SwiftParseTests
-   curses swiftParse swiftSIL swiftSema swiftClangImporter
+   swiftParse swiftSIL swiftSema swiftClangImporter
 )
diff --git a/unittests/runtime/CMakeLists.txt b/unittests/runtime/CMakeLists.txt
@@ -5,7 +5,6 @@ add_swift_unittest(SwiftRuntimeTests
 find_library(FOUNDATION_LIBRARY Foundation)
 
 target_link_libraries(SwiftRuntimeTests
-  curses
   swift_runtime
   ${FOUNDATION_LIBRARY}
   )