From b8fc718b5aae4ed2467ab97602410dcdc840dbe2 Mon Sep 17 00:00:00 2001
From: Nick Bolton <nick@synergy-project.org>
Date: Wed, 5 Feb 2014 16:53:27 +0000
Subject: [PATCH] - moved curl lib check to unix scope. - moved HAVE_Xi check
 back into linux scope as a precaution.

---
 CMakeLists.txt | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d80fd1c9..87fe4de3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -140,6 +140,9 @@ if (UNIX)
 	else (HAVE_PTHREAD)
 		message(FATAL_ERROR "Missing library: pthread")
 	endif()
+  
+  find_library(lib_CURL CURL)
+  list(APPEND libs ${lib_CURL})
 	
 	if (APPLE)
 		exec_program(uname ARGS -v OUTPUT_VARIABLE DARWIN_VERSION)
@@ -163,15 +166,12 @@ if (UNIX)
 		find_library(lib_ApplicationServices ApplicationServices)
 		find_library(lib_Foundation Foundation)
 		find_library(lib_Carbon Carbon)
-		find_library(lib_CURL CURL)
 
 		list(APPEND libs
 			${lib_ScreenSaver}
 			${lib_IOKit}
 			${lib_ApplicationServices}
-			${lib_Foundation}
-			${lib_Carbon}
-			${lib_CURL}
+			${lib_Foundation
 		)
 
 	else()
@@ -242,13 +242,15 @@ if (UNIX)
 		if (HAVE_Xrandr)
 			list(APPEND libs Xrandr)
 		endif()
+    
+    # this was outside of the linux scope,
+    # not sure why, moving it back inside.
+    if(HAVE_Xi)
+      list(APPEND libs Xi)
+    endif()
 
 	endif()
 
-        IF(HAVE_Xi)
-                LIST(APPEND libs Xi)
-        ENDIF()
-
 	# For config.h, set some static values; it may be a good idea to make
 	# these values dynamic for non-standard UNIX compilers.
 	set(ACCEPT_TYPE_ARG3 socklen_t)