From 5aa246f6b0fb62b472386b9830c3734c6f27c9e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Vuchener?= <clement.vuchener@gmail.com>
Date: Sat, 8 Apr 2023 12:33:24 +0200
Subject: [PATCH] plugins: include proto directory from current source
 directory

Updated remotefortressreader for the new behavior.
---
 plugins/Plugins.cmake                            | 10 +++++-----
 plugins/remotefortressreader/CMakeLists.txt      | 16 +---------------
 plugins/remotefortressreader/proto/.gitignore    |  3 +++
 .../proto/AdventureControl.proto                 |  0
 .../proto/DwarfControl.proto                     |  0
 .../proto/ItemdefInstrument.proto                |  0
 .../proto/RemoteFortressReader.proto             |  0
 .../proto/ui_sidebar_mode.proto                  |  0
 8 files changed, 9 insertions(+), 20 deletions(-)
 create mode 100644 plugins/remotefortressreader/proto/.gitignore
 rename plugins/{ => remotefortressreader}/proto/AdventureControl.proto (100%)
 rename plugins/{ => remotefortressreader}/proto/DwarfControl.proto (100%)
 rename plugins/{ => remotefortressreader}/proto/ItemdefInstrument.proto (100%)
 rename plugins/{ => remotefortressreader}/proto/RemoteFortressReader.proto (100%)
 rename plugins/{ => remotefortressreader}/proto/ui_sidebar_mode.proto (100%)

diff --git a/plugins/Plugins.cmake b/plugins/Plugins.cmake
index db7582c09..a0cea765f 100644
--- a/plugins/Plugins.cmake
+++ b/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})
diff --git a/plugins/remotefortressreader/CMakeLists.txt b/plugins/remotefortressreader/CMakeLists.txt
index 55525bc21..262d163f1 100644
--- a/plugins/remotefortressreader/CMakeLists.txt
+++ b/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})
diff --git a/plugins/remotefortressreader/proto/.gitignore b/plugins/remotefortressreader/proto/.gitignore
new file mode 100644
index 000000000..befabf79d
--- /dev/null
+++ b/plugins/remotefortressreader/proto/.gitignore
@@ -0,0 +1,3 @@
+*.pb.cc
+*.pb.cc.rule
+*.pb.h
diff --git a/plugins/proto/AdventureControl.proto b/plugins/remotefortressreader/proto/AdventureControl.proto
similarity index 100%
rename from plugins/proto/AdventureControl.proto
rename to plugins/remotefortressreader/proto/AdventureControl.proto
diff --git a/plugins/proto/DwarfControl.proto b/plugins/remotefortressreader/proto/DwarfControl.proto
similarity index 100%
rename from plugins/proto/DwarfControl.proto
rename to plugins/remotefortressreader/proto/DwarfControl.proto
diff --git a/plugins/proto/ItemdefInstrument.proto b/plugins/remotefortressreader/proto/ItemdefInstrument.proto
similarity index 100%
rename from plugins/proto/ItemdefInstrument.proto
rename to plugins/remotefortressreader/proto/ItemdefInstrument.proto
diff --git a/plugins/proto/RemoteFortressReader.proto b/plugins/remotefortressreader/proto/RemoteFortressReader.proto
similarity index 100%
rename from plugins/proto/RemoteFortressReader.proto
rename to plugins/remotefortressreader/proto/RemoteFortressReader.proto
diff --git a/plugins/proto/ui_sidebar_mode.proto b/plugins/remotefortressreader/proto/ui_sidebar_mode.proto
similarity index 100%
rename from plugins/proto/ui_sidebar_mode.proto
rename to plugins/remotefortressreader/proto/ui_sidebar_mode.proto