christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

Merge branch 'ubuntu-saucy-fixes'

Browse Source
This commit is contained in:
Horst Schirmeier
2014-01-24 17:02:44 +01:00
parent 4cb97a7fa5 17e76c140b
commit 85e3911202
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/cpn/CMakeLists.txt
View File

@ -4,6 +4,11 @@ set(SRCS
DatabaseCampaign.cc 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) add_dependencies(fail-cpn fail-comm)

2
src/core/util/CMakeLists.txt
View File

@ -36,7 +36,7 @@ include_directories(${PROTOBUF_INCLUDE_DIRS})
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
# required by Synchronized*.cc: # 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}) include_directories(${Boost_INCLUDE_DIRS})
link_directories(${Boost_LIBRARY_DIRS}) link_directories(${Boost_LIBRARY_DIRS})