Commit 6d17d83c authored by Sonja Happ's avatar Sonja Happ

move proto files out of libs folder as they are not a library

parent 4b842ab8
......@@ -44,7 +44,7 @@ if(WITH_DB)
#generate cpp and h files from proto files
execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/build/proto_to_cpp.sh)
#add protobuf .cc files to source list of distaix
file(GLOB_RECURSE PROTO_SRC_LIST libs/protobuf/cpp/*.cc)
file(GLOB_RECURSE PROTO_SRC_LIST ${CMAKE_CURRENT_SOURCE_DIR}/proto/cpp/*.cc)
list(APPEND SRC_LIST ${PROTO_SRC_LIST})
endif()
......@@ -68,7 +68,7 @@ if(WITH_DB)
#add a definition to use in the code
add_definitions(-DUSE_DB)
list(APPEND LIBRARIES_DISTAIX dbconnector ${LIB_PROTOBUF})
list(APPEND INCLUDE_DIRS_DISTAIX libs/protocolbuffers/src/ libs/protobuf/cpp)
list(APPEND INCLUDE_DIRS_DISTAIX libs/protocolbuffers/src/ proto/cpp)
endif()
if(WITH_VILLAS)
......
......@@ -4,7 +4,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
cd ${DIR}
echo "Converting proto to cpp and h files..."
cd ../libs/protobuf
cd ../proto
mkdir -p cpp
../protocolbuffers/protoc -I=`pwd` --cpp_out=cpp `pwd`/*.proto
../libs/protocolbuffers/protoc -I=`pwd` --cpp_out=cpp `pwd`/*.proto
echo "Finished converting proto to cpp and h files"
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment