Merge pull request #3184 from cvuchener/external-proto

Include proto directory from current source directory

plugins/Plugins.cmake

@@ -6,11 +6,6 @@ if(UNIX)
     endif()
 endif()
 
-include_directories("${dfhack_SOURCE_DIR}/library/include")
-include_directories("${dfhack_SOURCE_DIR}/library/proto")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/proto")
-include_directories("${dfhack_SOURCE_DIR}/library/depends/xgetopt")
-
 macro(car var)
     set(${var} ${ARGV1})
 endmacro()
@@ -123,6 +118,11 @@ macro(dfhack_plugin)
     add_library(${PLUGIN_NAME} MODULE ${PLUGIN_SOURCES})
     ide_folder(${PLUGIN_NAME} "Plugins")
 
+    target_include_directories(${PLUGIN_NAME} PRIVATE "${dfhack_SOURCE_DIR}/library/include")
+    target_include_directories(${PLUGIN_NAME} PRIVATE "${dfhack_SOURCE_DIR}/library/proto")
+    target_include_directories(${PLUGIN_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/proto")
+    target_include_directories(${PLUGIN_NAME} PRIVATE "${dfhack_SOURCE_DIR}/library/depends/xgetopt")
+
     if(NUM_PROTO)
         add_dependencies(${PLUGIN_NAME} generate_proto_${PLUGIN_NAME})
         target_link_libraries(${PLUGIN_NAME} dfhack protobuf-lite dfhack-version ${PLUGIN_LINK_LIBRARIES})

plugins/remotefortressreader/CMakeLists.txt

@@ -24,23 +24,9 @@ set(PROJECT_PROTO
     ui_sidebar_mode
 )
 
-set(PLUGIN_PROTOS)
-foreach(pbuf ${PROJECT_PROTO})
-    list(APPEND PLUGIN_PROTOS ${CMAKE_CURRENT_SOURCE_DIR}/../proto/${pbuf}.proto)
-endforeach()
-
-string(REPLACE ".proto" ".pb.cc" PLUGIN_PROTO_SRCS "${PLUGIN_PROTOS}")
-string(REPLACE ".proto" ".pb.h" PLUGIN_PROTO_HDRS "${PLUGIN_PROTOS}")
-set_source_files_properties(${PLUGIN_PROTO_SRCS} ${PLUGIN_PROTO_HDRS} PROPERTIES GENERATED TRUE)
-
-set_source_files_properties( ${PROJECT_HDRS} ${PLUGIN_PROTO_HDRS} PROPERTIES HEADER_FILE_ONLY TRUE)
-
-# mash them together (headers are marked as headers and nothing will try to compile them)
-list(APPEND PROJECT_SRCS ${PROJECT_HDRS} ${PLUGIN_PROTOS} ${PLUGIN_PROTO_SRCS} ${PLUGIN_PROTO_HDRS})
-
 if(UNIX AND NOT APPLE)
     set(PROJECT_LIBS ${PROJECT_LIBS} SDL)
 endif()
 
 # this makes sure all the stuff is put in proper places and linked to dfhack
-dfhack_plugin(RemoteFortressReader ${PROJECT_SRCS} LINK_LIBRARIES protobuf-lite ${PROJECT_LIBS} COMPILE_FLAGS_MSVC "/FI\"Export.h\"" COMPILE_FLAGS_GCC "-include Export.h -Wno-misleading-indentation" )
+dfhack_plugin(RemoteFortressReader ${PROJECT_SRCS} LINK_LIBRARIES ${PROJECT_LIBS} PROTOBUFS ${PROJECT_PROTO})

plugins/remotefortressreader/proto/.gitignore

@@ -0,0 +1,3 @@
+*.pb.cc
+*.pb.cc.rule
+*.pb.h