christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

Merge branch 'failpanda'

Browse Source 
Conflicts:
	src/core/comm/DatabaseCampaignMessage.proto.in
	src/core/cpn/CMakeLists.txt
	src/core/cpn/DatabaseCampaign.cc
	src/core/sal/ConcreteCPU.hpp
	src/core/sal/SALConfig.hpp
	src/core/util/CMakeLists.txt

Change-Id: Id86b93d0e3ea4d9963fcc88605eec0603575ec83
This commit is contained in:
Horst Schirmeier
2014-06-03 12:24:38 +02:00
parent 0afd619ec3 f75c8613d8
commit c827750090
1230 changed files with 579380 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,8 +7,21 @@ set(SRCS
find_package(MySQL REQUIRED)
include_directories(${MYSQL_INCLUDE_DIR})
# only compile concrete implementation of InjectionPoint
if(CONFIG_INJECTIONPOINT_HOPS)
set (SRCS ${SRCS} InjectionPointHops.cc)
else(CONFIG_INJECTIONPOINT_HOPS)
set (SRCS ${SRCS} InjectionPointSteps.cc)
endif(CONFIG_INJECTIONPOINT_HOPS)
add_library(fail-cpn ${SRCS})
target_link_libraries(fail-cpn fail-comm fail-util ${MYSQL_LIBRARIES})
# if hop-chains need to be calculated by the server, we
# the smarthopping module
if(CONFIG_INJECTIONPOINT_HOPS)
add_dependencies(fail-cpn fail-smarthops)
endif(CONFIG_INJECTIONPOINT_HOPS)
# make sure protobufs are generated before we include them
add_dependencies(fail-cpn fail-comm)