From bdd9b7515129d5ee4c939f08f8529122a3874a1a Mon Sep 17 00:00:00 2001
From: Christian Nowke <nowke@vr.rwth-aachen.de>
Date: Fri, 13 May 2016 19:26:24 +0200
Subject: [PATCH] added events
---
CMakeLists.txt | 6 ++++++
src/nett-python/nett-python.cpp | 3 +++
2 files changed, 9 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6291b3c..2cdf8f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,10 +27,12 @@ set (NETT_SCHEMA_DIR "" CACHE PATH "The nett schema path" )
set (NETT_LIBRARY "" CACHE FILEPATH "The nett library to link against" )
set (NETT_LIBRARY_DEBUG "" CACHE FILEPATH "The nett debug library to link against" )
+set( ZMQ_INCLUDE_DIR "" CACHE PATH "Path to the include directory of zmq" )
set( ZMQ_LIBRARY "" CACHE FILEPATH "The zmq library to link against" )
include( "src/nett-python/_SourceFiles.cmake" )
+include_directories (${ZMQ_INCLUDE_DIR})
include_directories (${NETT_INCLUDE_DIR})
include_directories (${BOOST_INCLUDE_DIR})
include_directories (${PYTHON_INCLUDE_DIR})
@@ -43,6 +45,10 @@ add_event ( nett_python routing_message ${NETT_SCHEMA_DIR} ${PROJECT_BINARY_DIR}
add_event ( nett_python string_message ${NETT_SCHEMA_DIR} ${PROJECT_BINARY_DIR} )
add_event ( nett_python float_message ${NETT_SCHEMA_DIR} ${PROJECT_BINARY_DIR} )
add_event ( nett_python string_vector_message ${NETT_SCHEMA_DIR} ${PROJECT_BINARY_DIR} )
+add_event ( nett_python float_vector_message ${NETT_SCHEMA_DIR} ${PROJECT_BINARY_DIR} )
+add_event ( nett_python hierarchy_message ${NETT_SCHEMA_DIR} ${PROJECT_BINARY_DIR} )
+add_event ( nett_python population_rates_message ${NETT_SCHEMA_DIR} ${PROJECT_BINARY_DIR} )
+
add_library (nett_python SHARED ${ProjectSources} ${nett_python_EVENT_SOURCE_FILES})
target_link_libraries( nett_python optimized ${NETT_LIBRARY} debug ${NETT_LIBRARY_DEBUG})
diff --git a/src/nett-python/nett-python.cpp b/src/nett-python/nett-python.cpp
index 5a13d91..ba221d8 100644
--- a/src/nett-python/nett-python.cpp
+++ b/src/nett-python/nett-python.cpp
@@ -12,6 +12,9 @@
#include <../schema/string_message.pb.h>
#include <../schema/float_message.pb.h>
#include <../schema/string_vector_message.pb.h>
+#include <../schema/float_vector_message.pb.h>
+#include <../schema/hierarchy_message.pb.h>
+#include <../schema/population_rates_message.pb.h>
using namespace boost::python;
--
GitLab