Merge pull request #2460 from myk002/myk_buildingplan

move buildingplan into subdir

plugins/CMakeLists.txt

@@ -96,7 +96,7 @@ if(BUILD_SUPPORTED)
     dfhack_plugin(blueprint blueprint.cpp LINK_LIBRARIES lua)
     dfhack_plugin(burrows burrows.cpp LINK_LIBRARIES lua)
     dfhack_plugin(building-hacks building-hacks.cpp LINK_LIBRARIES lua)
-    dfhack_plugin(buildingplan buildingplan.cpp buildingplan-planner.cpp buildingplan-rooms.cpp LINK_LIBRARIES lua)
+    add_subdirectory(buildingplan)
     dfhack_plugin(changeitem changeitem.cpp)
     dfhack_plugin(changelayer changelayer.cpp)
     dfhack_plugin(changevein changevein.cpp)

plugins/buildingplan/CMakeLists.txt

@@ -0,0 +1,11 @@
+project(buildingplan)
+
+set(COMMON_HDRS
+    buildingplan.h
+    buildingplan-planner.h
+    buildingplan-rooms.h
+)
+set_source_files_properties(${COMMON_HDRS} PROPERTIES HEADER_FILE_ONLY TRUE)
+
+dfhack_plugin(buildingplan buildingplan.cpp buildingplan-planner.cpp
+    buildingplan-rooms.cpp ${COMMON_HDRS} LINK_LIBRARIES lua)

plugins/buildingplan/buildingplan-planner.cpp

@@ -13,7 +13,7 @@
 #include "modules/Job.h"
 
 #include "LuaTools.h"
-#include "uicommon.h"
+#include "../uicommon.h"
 
 #include "buildingplan.h"
 

plugins/buildingplan/buildingplan.cpp

@@ -12,8 +12,8 @@
 #include "LuaTools.h"
 #include "PluginManager.h"
 
-#include "uicommon.h"
-#include "listcolumn.h"
+#include "../uicommon.h"
+#include "../listcolumn.h"
 #include "buildingplan.h"
 
 DFHACK_PLUGIN("buildingplan");