Simpler build for deinplace tool.

CMakeLists.txt

@@ -40,12 +40,6 @@ install(TARGETS fmri DESTINATION bin)
 
 # Build instructions for the deinplace tool
 find_package(Protobuf REQUIRED)
-protobuf_generate_cpp(CAFFE_PROTO_CPP CAFFE_PROTO_HEADERS "src/proto/caffe.proto")
-add_executable(deinplace
-	"src/tools/deinplace.cpp"
-	${CAFFE_PROTO_CPP}
-	${CAFFE_PROTO_HEADERS}
-	)
+add_executable(deinplace "src/tools/deinplace.cpp")
 target_compile_options(deinplace PRIVATE "-Wall" "-Wextra" "-pedantic")
-target_link_libraries(deinplace protobuf::libprotobuf)
-target_include_directories(deinplace PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
+target_link_libraries(deinplace Caffe::Caffe protobuf::libprotobuf)

src/tools/deinplace.cpp

@@ -4,7 +4,7 @@
 #include <fcntl.h>
 #include <google/protobuf/text_format.h>
 #include <google/protobuf/io/zero_copy_stream_impl.h>
-#include "caffe.pb.h"
+#include <caffe/proto/caffe.pb.h>
 
 static struct
 {