commit eea4400107cebffe53f7471abf3fc4a6a2402313
author Daniel Dunbar <daniel@zuster.org> Thu Dec 22 08:24:53 2016 -0800
committer GitHub <noreply@github.com> Thu Dec 22 08:24:53 2016 -0800
tree a91d9641e0d7207667ed89bf0e5850c3a646663b
parent 16458bf72307f42719eaa0236a31bb59a07cf482
parent 77c5aaa771483649d2c3ff85028a7398da583254

Merge pull request #56 from hughbe/curses-lib

Don't attempt to link curses.lib on Windows

products/libllbuild/CMakeLists.txt

diff --git a/products/libllbuild/CMakeLists.txt b/products/libllbuild/CMakeLists.txt
index 2cb88e1..1983b8b 100644
--- a/products/libllbuild/CMakeLists.txt
+++ b/products/libllbuild/CMakeLists.txt
@@ -7,8 +7,11 @@
   llbuildCore
   llbuildBasic
   llvmSupport
-  sqlite3
-  curses)
+  sqlite3)
+
+if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+  list(APPEND DEPENDENCIES curses)
+endif()
 
 add_llbuild_library(libllbuild
   ${SOURCES}

products/llbuild/CMakeLists.txt

diff --git a/products/llbuild/CMakeLists.txt b/products/llbuild/CMakeLists.txt
index c56fdc5..6dde8a3 100644
--- a/products/llbuild/CMakeLists.txt
+++ b/products/llbuild/CMakeLists.txt
@@ -8,6 +8,8 @@
   llbuildCore
   llbuildBasic
   llvmSupport
-  sqlite3
-  curses
-  )
+  sqlite3)
+
+if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+  target_link_libraries(llbuild curses)
+endif()

products/swift-build-tool/CMakeLists.txt

diff --git a/products/swift-build-tool/CMakeLists.txt b/products/swift-build-tool/CMakeLists.txt
index 196adc9..4bbca9e 100644
--- a/products/swift-build-tool/CMakeLists.txt
+++ b/products/swift-build-tool/CMakeLists.txt
@@ -6,9 +6,11 @@
   llbuildCore
   llbuildBasic
   llvmSupport
-  sqlite3
-  curses
-  )
+  sqlite3)
+
+if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+  target_link_libraries(swift-build-tool curses)
+endif()
 
 install(TARGETS swift-build-tool
         COMPONENT swift-build-tool

unittests/Basic/CMakeLists.txt

diff --git a/unittests/Basic/CMakeLists.txt b/unittests/Basic/CMakeLists.txt
index 30cc7ff..deb7907 100644
--- a/unittests/Basic/CMakeLists.txt
+++ b/unittests/Basic/CMakeLists.txt
@@ -4,4 +4,8 @@
   ShellUtilityTest.cpp
   )
 
-target_link_libraries(BasicTests llbuildBasic llvmSupport curses)
+target_link_libraries(BasicTests llbuildBasic llvmSupport)
+
+if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+  target_link_libraries(BasicTests curses)
+endif()

unittests/BuildSystem/CMakeLists.txt

diff --git a/unittests/BuildSystem/CMakeLists.txt b/unittests/BuildSystem/CMakeLists.txt
index 6512a3f..df0113d 100644
--- a/unittests/BuildSystem/CMakeLists.txt
+++ b/unittests/BuildSystem/CMakeLists.txt
@@ -2,4 +2,8 @@
   LaneBasedExecutionQueueTest
   )
 
-target_link_libraries(BuildSystemTests curses llbuildBuildSystem llvmSupport)
+target_link_libraries(BuildSystemTests llbuildBuildSystem llvmSupport)
+
+if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+  target_link_libraries(BuildSystemTests curses)
+endif()

unittests/Core/CMakeLists.txt

diff --git a/unittests/Core/CMakeLists.txt b/unittests/Core/CMakeLists.txt
index c6b40d1..c772d1b 100644
--- a/unittests/Core/CMakeLists.txt
+++ b/unittests/Core/CMakeLists.txt
@@ -5,4 +5,9 @@
   MakefileDepsParserTest.cpp
   )
 
-target_link_libraries(CoreTests llbuildCore llvmSupport sqlite3 curses)
+target_link_libraries(CoreTests llbuildCore llvmSupport sqlite3)
+
+if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+  target_link_libraries(CoreTests curses)
+endif()
+

unittests/Ninja/CMakeLists.txt

diff --git a/unittests/Ninja/CMakeLists.txt b/unittests/Ninja/CMakeLists.txt
index d2f761e..109528b 100644
--- a/unittests/Ninja/CMakeLists.txt
+++ b/unittests/Ninja/CMakeLists.txt
@@ -2,4 +2,8 @@
   LexerTest.cpp
   )
 
-target_link_libraries(NinjaTests llbuildNinja curses)
+target_link_libraries(NinjaTests llbuildNinja)
+
+if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+  target_link_libraries(NinjaTests curses)
+endif()