Merge branch 'master' of ssh://i4gerrit.informatik.uni-erlangen.de:29418/fail

This commit is contained in:
Bjoern Doebel
2014-04-23 14:55:40 +02:00
32 changed files with 1038 additions and 127 deletions

View File

@ -8,7 +8,7 @@ find_package(MySQL REQUIRED)
include_directories(${MYSQL_INCLUDE_DIR})
add_library(fail-cpn ${SRCS})
target_link_libraries(fail-cpn fail-comm ${MYSQL_LIBRARIES})
target_link_libraries(fail-cpn fail-comm fail-util ${MYSQL_LIBRARIES})
# make sure protobufs are generated before we include them
add_dependencies(fail-cpn fail-comm)