Index: u1db/src/CMakeLists.txt
===================================================================
--- u1db.orig/src/CMakeLists.txt	2014-11-16 16:07:31.251898767 -0500
+++ u1db/src/CMakeLists.txt	2014-11-16 16:08:04.947002510 -0500
@@ -24,6 +24,7 @@
   DEPENDS ${CMAKE_SOURCE_DIR}/u1db/backends/dbschema.sql ${CMAKE_SOURCE_DIR}/sql_to_c.py
   )
 add_library (u1db ${LIB_TYPE} mkstemp_compat.c u1db.c u1db_http_sync_target.c u1db_query.c  u1db_sync_target.c  u1db_uuid.c  u1db_vectorclock.c u1db_schema.c)
+target_link_libraries(u1db ${CURL_LIBRARIES} ${OAUTH_LIBRARIES} ${JSON_LIBRARIES} ${SQLITE3_LIBRARIES})
 
 SET_TARGET_PROPERTIES(u1db
     PROPERTIES SOVERSION 1
@@ -39,3 +40,4 @@
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/u1db DESTINATION include
     FILES_MATCHING PATTERN "u1db.h"
 )
+
Index: u1db/cmake/Modules/FindOAUTH.cmake
===================================================================
--- u1db.orig/cmake/Modules/FindOAUTH.cmake	2014-11-16 16:07:31.251898767 -0500
+++ u1db/cmake/Modules/FindOAUTH.cmake	2014-11-16 16:07:48.139449585 -0500
@@ -8,7 +8,7 @@
 find_package(PkgConfig)
 pkg_check_modules(PC_OAUTH oauth)
 
-FIND_PATH(OAuth_INCLUDE_DIR oauth.h
+find_path(OAUTH_INCLUDE_DIR oauth.h
   HINTS
   ${PC_OAUTH_INCLUDE_DIRS}
   /usr/include
@@ -17,16 +17,16 @@
   PATH_SUFFIXES oauth
 )
 
-FIND_LIBRARY(OAuth_LIBRARY
-  NAMES ${OAuth_NAMES} liboauth.so liboauth.dylib
+find_library(OAUTH_LIBRARY
+  NAMES ${OAUTH_NAMES} liboauth.so liboauth.dylib
   HINTS ${PC_OAUTH_LIBRARY_DIRS}
   /usr/lib /usr/local/lib /opt/local/lib
 )
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(OAuth DEFAULT_MSG OAuth_LIBRARY OAuth_INCLUDE_DIR)
+find_package_handle_standard_args(OAUTH DEFAULT_MSG OAUTH_LIBRARY OAUTH_INCLUDE_DIR)
 
-IF(OAuth_FOUND)
-  SET(OAuth_LIBRARIES ${OAuth_LIBRARY})
-  SET(OAuth_INCLUDE_DIRS ${OAuth_INCLUDE_DIR})
-ENDIF(OAuth_FOUND)
+if(OAUTH_FOUND)
+  set(OAUTH_LIBRARIES ${OAUTH_LIBRARY})
+  set(OAUTH_INCLUDE_DIRS ${OAUTH_INCLUDE_DIR})
+endif()
Index: u1db/cmake/Modules/FindSqlite3.cmake
===================================================================
--- u1db.orig/cmake/Modules/FindSqlite3.cmake	2014-11-16 16:07:31.251898767 -0500
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-# - Try to find Sqlite3
-# Once done, this will define
-#
-#  Sqlite3_FOUND - system has Sqlite3
-#  Sqlite3_INCLUDE_DIRS - the Sqlite3 include directories
-#  Sqlite3_LIBRARIES - link these to use Sqlite3
-
-find_package(PkgConfig)
-pkg_check_modules(PC_SQLITE3 sqlite3)
-
-FIND_PATH(Sqlite3_INCLUDE_DIR sqlite3.h
-  HINTS
-  ${PC_SQLITE3_INCLUDE_DIRS}
-  /usr/include
-  /usr/local/include
-  /opt/local/include
-)
-
-FIND_LIBRARY(Sqlite3_LIBRARY
-  NAMES ${Sqlite3_NAMES} libsqlite3.so libsqlite3.dylib
-  HINTS ${PC_SQLITE3_LIBRARY_DIRS}
-  /usr/lib /usr/local/lib /opt/local/lib
-)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Sqlite3 DEFAULT_MSG Sqlite3_LIBRARY Sqlite3_INCLUDE_DIR)
-
-IF(Sqlite3_FOUND)
-  SET(Sqlite3_LIBRARIES ${Sqlite3_LIBRARY})
-  SET(Sqlite3_INCLUDE_DIRS ${Sqlite3_INCLUDE_DIR})
-ENDIF(Sqlite3_FOUND)
Index: u1db/CMakeLists.txt
===================================================================
--- u1db.orig/CMakeLists.txt	2014-11-16 16:07:31.251898767 -0500
+++ u1db/CMakeLists.txt	2014-11-16 16:07:31.247898872 -0500
@@ -30,10 +30,10 @@
   include_directories(${JSON_INCLUDE_DIRS})
 endif (JSON_FOUND)
 
-find_package(Sqlite3 REQUIRED)
-if (Sqlite3_FOUND)
-  include_directories(${Sqlite3_INCLUDE_DIRS})
-endif (Sqlite3_FOUND)
+find_package(SQLITE3 REQUIRED)
+if (SQLITE3_FOUND)
+  include_directories(${SQLITE3_INCLUDE_DIRS})
+endif (SQLITE3_FOUND)
 
 add_custom_target( ReplicatePythonSourceTree ALL ${CMAKE_COMMAND} -P
   ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/ReplicatePythonSourceTree.cmake
Index: u1db/cmake/Modules/FindSQLITE3.cmake
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ u1db/cmake/Modules/FindSQLITE3.cmake	2014-11-16 16:07:31.247898872 -0500
@@ -0,0 +1,31 @@
+# - Try to find Sqlite3
+# Once done, this will define
+#
+#  Sqlite3_FOUND - system has Sqlite3
+#  Sqlite3_INCLUDE_DIRS - the Sqlite3 include directories
+#  Sqlite3_LIBRARIES - link these to use Sqlite3
+
+find_package(PkgConfig)
+pkg_check_modules(PC_SQLITE3 sqlite3)
+
+find_path(SQLITE3_INCLUDE_DIR sqlite3.h
+  HINTS
+  ${PC_SQLITE3_INCLUDE_DIRS}
+  /usr/include
+  /usr/local/include
+  /opt/local/include
+)
+
+find_library(SQLITE3_LIBRARY
+  NAMES ${SQLITE3_NAMES} libsqlite3.so libsqlite3.dylib
+  HINTS ${PC_SQLITE3_LIBRARY_DIRS}
+  /usr/lib /usr/local/lib /opt/local/lib
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(SQLITE3 DEFAULT_MSG SQLITE3_LIBRARY SQLITE3_INCLUDE_DIR)
+
+if(SQLITE3_FOUND)
+  set(SQLITE3_LIBRARIES ${SQLITE3_LIBRARY})
+  set(SQLITE3_INCLUDE_DIRS ${SQLITE3_INCLUDE_DIR})
+endif()
