From c24e54f2d4d019869abc7cd81f52be3d3eca54bc Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Tue, 21 Oct 2014 12:41:59 +0200 Subject: [PATCH] weather-monitor: adapt CMake configuration for experiment The configuration needed to build this experiment is no noted within the experiment's CMakeLists.txt. This allows the easy building of this experiment. Change-Id: Ifddc4e6a8fa4e63c4656058166f9ef42e46e1edb --- .../weather-monitor/CMakeLists.txt | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/src/experiments/weather-monitor/CMakeLists.txt b/src/experiments/weather-monitor/CMakeLists.txt index be372d6d..acc804b9 100644 --- a/src/experiments/weather-monitor/CMakeLists.txt +++ b/src/experiments/weather-monitor/CMakeLists.txt @@ -4,6 +4,25 @@ configure_file(../instantiate-experiment.ah.in ${CMAKE_CURRENT_BINARY_DIR}/instantiate-${EXPERIMENT_NAME}.ah @ONLY ) +## Configuration +SET(BUILD_BOCHS ON CACHE BOOL "Enable Bochs Support") +SET(BUILD_X86 ON CACHE BOOL "") +SET(CONFIG_BOCHS_NO_ABORT ON CACHE BOOL "") + +SET(CONFIG_EVENT_BREAKPOINTS ON CACHE BOOL "") +SET(CONFIG_EVENT_BREAKPOINTS_RANGE ON CACHE BOOL "") +SET(CONFIG_EVENT_INTERRUPT ON CACHE BOOL "") +SET(CONFIG_EVENT_IOPORT ON CACHE BOOL "") +SET(CONFIG_EVENT_MEMREAD ON CACHE BOOL "") +SET(CONFIG_EVENT_MEMWRITE ON CACHE BOOL "") +SET(CONFIG_EVENT_TRAP ON CACHE BOOL "") +SET(CONFIG_SR_RESTORE ON CACHE BOOK "") +SET(CONFIG_SR_SAVE ON CACHE BOOL "") + +SET(PLUGINS_ACTIVATED "tracing" CACHE STRING "") + +SET(bochs_configure_params "--enable-a20-pin;--enable-x86-64;--enable-cpu-level=6;--enable-ne2000;--enable-acpi;--enable-pci;--enable-usb;--enable-trace-cache;--enable-fast-function-calls;--enable-host-specific-asms;--enable-disasm;--enable-readline;--enable-clgd54xx;--enable-fpu;--enable-vmx=2;--enable-monitor-mwait;--enable-cdrom;--enable-sb16=linux;--enable-gdb-stub;--with-nogui" CACHE STRING "") + ## Setup desired protobuf descriptions HERE ## set(MY_PROTOS weathermonitor.proto @@ -27,8 +46,8 @@ PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS}) ## Build library add_library(fail-${EXPERIMENT_NAME} ${PROTO_SRCS} ${PROTO_HDRS} ${MY_CAMPAIGN_SRCS}) -add_dependencies(fail-${EXPERIMENT_NAME} fail-comm fail-util) -target_link_libraries(fail-${EXPERIMENT_NAME} fail-tracing fail-comm fail-util) +add_dependencies(fail-${EXPERIMENT_NAME} fail-comm fail-util fail-sal fail-tracing) +target_link_libraries(fail-${EXPERIMENT_NAME} fail-comm fail-util fail-sal fail-tracing) target_link_libraries(fail-${EXPERIMENT_NAME} ${PROTOBUF_LIBRARY}) ## This is the example's campaign server distributing experiment parameters