From bf6affeca39facbdbab6d67b9f43511a962d321d Mon Sep 17 00:00:00 2001 From: Horst Schirmeier Date: Tue, 19 Mar 2013 22:30:39 +0100 Subject: [PATCH] decouple ecos experiment class definition from instantiation aspect See 65eb44a746bb453cfacb684d13e31a4e4a3542f9 for an explanation. --- src/experiments/ecos_kernel_test/CMakeLists.txt | 3 ++- src/experiments/ecos_kernel_test/instantiateExperiment.cc | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 src/experiments/ecos_kernel_test/instantiateExperiment.cc diff --git a/src/experiments/ecos_kernel_test/CMakeLists.txt b/src/experiments/ecos_kernel_test/CMakeLists.txt index 9bbe2f11..d106abd4 100644 --- a/src/experiments/ecos_kernel_test/CMakeLists.txt +++ b/src/experiments/ecos_kernel_test/CMakeLists.txt @@ -1,6 +1,6 @@ set(EXPERIMENT_NAME ecos_kernel_test) set(EXPERIMENT_TYPE EcosKernelTestExperiment) -configure_file(../instantiate-experiment.ah.in +configure_file(../instantiate-experiment-indirect.ah.in ${CMAKE_CURRENT_BINARY_DIR}/instantiate-${EXPERIMENT_NAME}.ah @ONLY ) @@ -10,6 +10,7 @@ set(MY_PROTOS ) set(MY_CAMPAIGN_SRCS + instantiateExperiment.cc experiment.hpp experiment.cc campaign.hpp diff --git a/src/experiments/ecos_kernel_test/instantiateExperiment.cc b/src/experiments/ecos_kernel_test/instantiateExperiment.cc new file mode 100644 index 00000000..520be8a3 --- /dev/null +++ b/src/experiments/ecos_kernel_test/instantiateExperiment.cc @@ -0,0 +1,8 @@ +#include "experiment.hpp" +#include "sal/SALInst.hpp" + +static EcosKernelTestExperiment experiment; +void instantiateEcosKernelTestExperiment() +{ + fail::simulator.addFlow(&experiment); +}