From f75c8613d82ef44cf298f398d368b386e5b940d2 Mon Sep 17 00:00:00 2001 From: Horst Schirmeier Date: Tue, 3 Jun 2014 12:18:03 +0200 Subject: [PATCH] experiments: use generated dbcampaign protobuf msg Since commit c142818, DatabaseCampaignMessage.proto is generated into the binary directory, which must be announced to the protobuf compiler. Change-Id: I0c3c4c6525df687012330573979dc897dfa8d701 --- src/experiments/cored-voter/CMakeLists.txt | 1 + src/experiments/dciao-kernelstructs/CMakeLists.txt | 1 + src/experiments/kesorefs/CMakeLists.txt | 1 + src/experiments/l4-sys/CMakeLists.txt | 1 + 4 files changed, 4 insertions(+) diff --git a/src/experiments/cored-voter/CMakeLists.txt b/src/experiments/cored-voter/CMakeLists.txt index 3e605c29..634692b1 100644 --- a/src/experiments/cored-voter/CMakeLists.txt +++ b/src/experiments/cored-voter/CMakeLists.txt @@ -21,6 +21,7 @@ find_package(Protobuf REQUIRED) include_directories(${PROTOBUF_INCLUDE_DIRS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) +set(PROTOBUF_IMPORT_DIRS ${PROTOBUF_IMPORT_DIRS} ${CMAKE_CURRENT_BINARY_DIR}/../../core/comm) PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS}) ## Build library diff --git a/src/experiments/dciao-kernelstructs/CMakeLists.txt b/src/experiments/dciao-kernelstructs/CMakeLists.txt index a14aacf7..d0de916c 100644 --- a/src/experiments/dciao-kernelstructs/CMakeLists.txt +++ b/src/experiments/dciao-kernelstructs/CMakeLists.txt @@ -24,6 +24,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) find_package(MySQL REQUIRED) include_directories(${MYSQL_INCLUDE_DIR}) +set(PROTOBUF_IMPORT_DIRS ${PROTOBUF_IMPORT_DIRS} ${CMAKE_CURRENT_BINARY_DIR}/../../core/comm) PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS}) ## Build library diff --git a/src/experiments/kesorefs/CMakeLists.txt b/src/experiments/kesorefs/CMakeLists.txt index 37298030..a6c269d8 100644 --- a/src/experiments/kesorefs/CMakeLists.txt +++ b/src/experiments/kesorefs/CMakeLists.txt @@ -24,6 +24,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) find_package(MySQL REQUIRED) include_directories(${MYSQL_INCLUDE_DIR}) +set(PROTOBUF_IMPORT_DIRS ${PROTOBUF_IMPORT_DIRS} ${CMAKE_CURRENT_BINARY_DIR}/../../core/comm) PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS}) ## Build library diff --git a/src/experiments/l4-sys/CMakeLists.txt b/src/experiments/l4-sys/CMakeLists.txt index e9041057..90a95c0d 100644 --- a/src/experiments/l4-sys/CMakeLists.txt +++ b/src/experiments/l4-sys/CMakeLists.txt @@ -29,6 +29,7 @@ find_package(Protobuf REQUIRED) include_directories(${PROTOBUF_INCLUDE_DIRS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) +set(PROTOBUF_IMPORT_DIRS ${PROTOBUF_IMPORT_DIRS} ${CMAKE_CURRENT_BINARY_DIR}/../../core/comm) PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${MY_PROTOS}) ## Build library