Merge branch 'ubuntu-saucy-fixes'

src/core/cpn/CMakeLists.txt

@@ -4,6 +4,11 @@ set(SRCS
 	DatabaseCampaign.cc
 )
 
-add_library(fail-cpn ${SRCS})
+find_package(MySQL REQUIRED)
+include_directories(${MYSQL_INCLUDE_DIR})
 
+add_library(fail-cpn ${SRCS})
+target_link_libraries(fail-cpn fail-comm ${MYSQL_LIBRARIES})
+
+# make sure protobufs are generated before we include them
 add_dependencies(fail-cpn fail-comm)

src/core/util/CMakeLists.txt

@@ -36,7 +36,7 @@ include_directories(${PROTOBUF_INCLUDE_DIRS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 # required by Synchronized*.cc:
-find_package(Boost 1.42 COMPONENTS thread regex REQUIRED)
+find_package(Boost 1.42 COMPONENTS thread regex system REQUIRED)
 include_directories(${Boost_INCLUDE_DIRS})
 link_directories(${Boost_LIBRARY_DIRS})