Merge remote-tracking branch 'lethosor/cmake-plugin-flags-devel' into develop

develop
lethosor 2023-08-01 00:55:46 -04:00
commit e0a9626876
No known key found for this signature in database
GPG Key ID: 76A269552F4F58C1
2 changed files with 105 additions and 102 deletions

@ -21,7 +21,7 @@ endif()
option(BUILD_DEV_PLUGINS "Build developer plugins." OFF) option(BUILD_DEV_PLUGINS "Build developer plugins." OFF)
if(BUILD_DEV_PLUGINS) if(BUILD_DEV_PLUGINS)
#add_subdirectory(devel) add_subdirectory(devel)
endif() endif()
if(INSTALL_DATA_FILES) if(INSTALL_DATA_FILES)
@ -75,102 +75,105 @@ set_source_files_properties( Brushes.h PROPERTIES HEADER_FILE_ONLY TRUE )
# If you are adding a plugin that you do not intend to commit to the DFHack repo, # If you are adding a plugin that you do not intend to commit to the DFHack repo,
# see instructions for adding "external" plugins at the end of this file. # see instructions for adding "external" plugins at the end of this file.
dfhack_plugin(3dveins 3dveins.cpp) option(BUILD_SUPPORTED "Build the supported plugins (reveal, probe, etc.)." ON)
dfhack_plugin(add-spatter add-spatter.cpp) if(BUILD_SUPPORTED)
dfhack_plugin(autobutcher autobutcher.cpp LINK_LIBRARIES lua) dfhack_plugin(3dveins 3dveins.cpp)
dfhack_plugin(autochop autochop.cpp LINK_LIBRARIES lua) dfhack_plugin(add-spatter add-spatter.cpp)
dfhack_plugin(autoclothing autoclothing.cpp LINK_LIBRARIES lua) dfhack_plugin(autobutcher autobutcher.cpp LINK_LIBRARIES lua)
dfhack_plugin(design design.cpp LINK_LIBRARIES lua) dfhack_plugin(autochop autochop.cpp LINK_LIBRARIES lua)
dfhack_plugin(autodump autodump.cpp) dfhack_plugin(autoclothing autoclothing.cpp LINK_LIBRARIES lua)
dfhack_plugin(autofarm autofarm.cpp) dfhack_plugin(design design.cpp LINK_LIBRARIES lua)
#dfhack_plugin(autogems autogems.cpp LINK_LIBRARIES jsoncpp_static) dfhack_plugin(autodump autodump.cpp)
add_subdirectory(autolabor) dfhack_plugin(autofarm autofarm.cpp)
dfhack_plugin(autonestbox autonestbox.cpp LINK_LIBRARIES lua) #dfhack_plugin(autogems autogems.cpp LINK_LIBRARIES jsoncpp_static)
dfhack_plugin(autoslab autoslab.cpp) add_subdirectory(autolabor)
dfhack_plugin(blueprint blueprint.cpp LINK_LIBRARIES lua) dfhack_plugin(autonestbox autonestbox.cpp LINK_LIBRARIES lua)
#dfhack_plugin(burrows burrows.cpp LINK_LIBRARIES lua) dfhack_plugin(autoslab autoslab.cpp)
#dfhack_plugin(building-hacks building-hacks.cpp LINK_LIBRARIES lua) dfhack_plugin(blueprint blueprint.cpp LINK_LIBRARIES lua)
add_subdirectory(buildingplan) #dfhack_plugin(burrows burrows.cpp LINK_LIBRARIES lua)
dfhack_plugin(changeitem changeitem.cpp) #dfhack_plugin(building-hacks building-hacks.cpp LINK_LIBRARIES lua)
dfhack_plugin(changelayer changelayer.cpp) add_subdirectory(buildingplan)
dfhack_plugin(changevein changevein.cpp) dfhack_plugin(changeitem changeitem.cpp)
add_subdirectory(channel-safely) dfhack_plugin(changelayer changelayer.cpp)
dfhack_plugin(cleanconst cleanconst.cpp) dfhack_plugin(changevein changevein.cpp)
dfhack_plugin(cleaners cleaners.cpp) add_subdirectory(channel-safely)
dfhack_plugin(cleanowned cleanowned.cpp) dfhack_plugin(cleanconst cleanconst.cpp)
dfhack_plugin(confirm confirm.cpp LINK_LIBRARIES lua) dfhack_plugin(cleaners cleaners.cpp)
dfhack_plugin(createitem createitem.cpp) dfhack_plugin(cleanowned cleanowned.cpp)
dfhack_plugin(cursecheck cursecheck.cpp) dfhack_plugin(confirm confirm.cpp LINK_LIBRARIES lua)
dfhack_plugin(cxxrandom cxxrandom.cpp LINK_LIBRARIES lua) dfhack_plugin(createitem createitem.cpp)
dfhack_plugin(deramp deramp.cpp) dfhack_plugin(cursecheck cursecheck.cpp)
dfhack_plugin(debug debug.cpp LINK_LIBRARIES jsoncpp_static) dfhack_plugin(cxxrandom cxxrandom.cpp LINK_LIBRARIES lua)
dfhack_plugin(dig dig.cpp) dfhack_plugin(deramp deramp.cpp)
dfhack_plugin(dig-now dig-now.cpp LINK_LIBRARIES lua) dfhack_plugin(debug debug.cpp LINK_LIBRARIES jsoncpp_static)
#dfhack_plugin(digFlood digFlood.cpp) dfhack_plugin(dig dig.cpp)
#add_subdirectory(diggingInvaders) dfhack_plugin(dig-now dig-now.cpp LINK_LIBRARIES lua)
dfhack_plugin(dwarfvet dwarfvet.cpp LINK_LIBRARIES lua) #dfhack_plugin(digFlood digFlood.cpp)
#dfhack_plugin(dwarfmonitor dwarfmonitor.cpp LINK_LIBRARIES lua) #add_subdirectory(diggingInvaders)
#add_subdirectory(embark-assistant) dfhack_plugin(dwarfvet dwarfvet.cpp LINK_LIBRARIES lua)
#dfhack_plugin(embark-tools embark-tools.cpp) #dfhack_plugin(dwarfmonitor dwarfmonitor.cpp LINK_LIBRARIES lua)
dfhack_plugin(eventful eventful.cpp LINK_LIBRARIES lua) #add_subdirectory(embark-assistant)
dfhack_plugin(fastdwarf fastdwarf.cpp) #dfhack_plugin(embark-tools embark-tools.cpp)
dfhack_plugin(faststart faststart.cpp) dfhack_plugin(eventful eventful.cpp LINK_LIBRARIES lua)
dfhack_plugin(filltraffic filltraffic.cpp) dfhack_plugin(fastdwarf fastdwarf.cpp)
#dfhack_plugin(fix-unit-occupancy fix-unit-occupancy.cpp) dfhack_plugin(faststart faststart.cpp)
#dfhack_plugin(fixveins fixveins.cpp) dfhack_plugin(filltraffic filltraffic.cpp)
dfhack_plugin(flows flows.cpp) #dfhack_plugin(fix-unit-occupancy fix-unit-occupancy.cpp)
#dfhack_plugin(follow follow.cpp) #dfhack_plugin(fixveins fixveins.cpp)
#dfhack_plugin(forceequip forceequip.cpp) dfhack_plugin(flows flows.cpp)
#dfhack_plugin(generated-creature-renamer generated-creature-renamer.cpp) #dfhack_plugin(follow follow.cpp)
dfhack_plugin(getplants getplants.cpp) #dfhack_plugin(forceequip forceequip.cpp)
dfhack_plugin(hotkeys hotkeys.cpp LINK_LIBRARIES lua) #dfhack_plugin(generated-creature-renamer generated-creature-renamer.cpp)
#dfhack_plugin(infiniteSky infiniteSky.cpp) dfhack_plugin(getplants getplants.cpp)
#dfhack_plugin(isoworldremote isoworldremote.cpp PROTOBUFS isoworldremote) dfhack_plugin(hotkeys hotkeys.cpp LINK_LIBRARIES lua)
#dfhack_plugin(jobutils jobutils.cpp) #dfhack_plugin(infiniteSky infiniteSky.cpp)
dfhack_plugin(lair lair.cpp) #dfhack_plugin(isoworldremote isoworldremote.cpp PROTOBUFS isoworldremote)
dfhack_plugin(liquids liquids.cpp Brushes.h LINK_LIBRARIES lua) #dfhack_plugin(jobutils jobutils.cpp)
dfhack_plugin(luasocket luasocket.cpp LINK_LIBRARIES clsocket lua dfhack-tinythread) dfhack_plugin(lair lair.cpp)
dfhack_plugin(logistics logistics.cpp LINK_LIBRARIES lua) dfhack_plugin(liquids liquids.cpp Brushes.h LINK_LIBRARIES lua)
#dfhack_plugin(manipulator manipulator.cpp) dfhack_plugin(luasocket luasocket.cpp LINK_LIBRARIES clsocket lua dfhack-tinythread)
#dfhack_plugin(map-render map-render.cpp LINK_LIBRARIES lua) dfhack_plugin(logistics logistics.cpp LINK_LIBRARIES lua)
dfhack_plugin(misery misery.cpp LINK_LIBRARIES lua) #dfhack_plugin(manipulator manipulator.cpp)
#dfhack_plugin(mode mode.cpp) #dfhack_plugin(map-render map-render.cpp LINK_LIBRARIES lua)
#dfhack_plugin(mousequery mousequery.cpp) dfhack_plugin(misery misery.cpp LINK_LIBRARIES lua)
dfhack_plugin(nestboxes nestboxes.cpp) #dfhack_plugin(mode mode.cpp)
dfhack_plugin(orders orders.cpp LINK_LIBRARIES jsoncpp_static lua) #dfhack_plugin(mousequery mousequery.cpp)
dfhack_plugin(overlay overlay.cpp LINK_LIBRARIES lua) dfhack_plugin(nestboxes nestboxes.cpp)
dfhack_plugin(pathable pathable.cpp LINK_LIBRARIES lua) dfhack_plugin(orders orders.cpp LINK_LIBRARIES jsoncpp_static lua)
#dfhack_plugin(petcapRemover petcapRemover.cpp) dfhack_plugin(overlay overlay.cpp LINK_LIBRARIES lua)
#dfhack_plugin(plants plants.cpp) dfhack_plugin(pathable pathable.cpp LINK_LIBRARIES lua)
dfhack_plugin(probe probe.cpp) #dfhack_plugin(petcapRemover petcapRemover.cpp)
dfhack_plugin(prospector prospector.cpp LINK_LIBRARIES lua) #dfhack_plugin(plants plants.cpp)
#dfhack_plugin(power-meter power-meter.cpp LINK_LIBRARIES lua) dfhack_plugin(probe probe.cpp)
dfhack_plugin(regrass regrass.cpp) dfhack_plugin(prospector prospector.cpp LINK_LIBRARIES lua)
add_subdirectory(remotefortressreader) #dfhack_plugin(power-meter power-meter.cpp LINK_LIBRARIES lua)
#dfhack_plugin(rename rename.cpp LINK_LIBRARIES lua PROTOBUFS rename) dfhack_plugin(regrass regrass.cpp)
#add_subdirectory(rendermax) add_subdirectory(remotefortressreader)
dfhack_plugin(reveal reveal.cpp LINK_LIBRARIES lua) #dfhack_plugin(rename rename.cpp LINK_LIBRARIES lua PROTOBUFS rename)
#dfhack_plugin(search search.cpp) #add_subdirectory(rendermax)
dfhack_plugin(seedwatch seedwatch.cpp LINK_LIBRARIES lua) dfhack_plugin(reveal reveal.cpp LINK_LIBRARIES lua)
dfhack_plugin(showmood showmood.cpp) #dfhack_plugin(search search.cpp)
#dfhack_plugin(siege-engine siege-engine.cpp LINK_LIBRARIES lua) dfhack_plugin(seedwatch seedwatch.cpp LINK_LIBRARIES lua)
#dfhack_plugin(sort sort.cpp LINK_LIBRARIES lua) dfhack_plugin(showmood showmood.cpp)
#dfhack_plugin(steam-engine steam-engine.cpp) #dfhack_plugin(siege-engine siege-engine.cpp LINK_LIBRARIES lua)
#add_subdirectory(spectate) #dfhack_plugin(sort sort.cpp LINK_LIBRARIES lua)
#dfhack_plugin(stockflow stockflow.cpp LINK_LIBRARIES lua) #dfhack_plugin(steam-engine steam-engine.cpp)
add_subdirectory(stockpiles) #add_subdirectory(spectate)
#dfhack_plugin(stocks stocks.cpp) #dfhack_plugin(stockflow stockflow.cpp LINK_LIBRARIES lua)
dfhack_plugin(strangemood strangemood.cpp) add_subdirectory(stockpiles)
dfhack_plugin(tailor tailor.cpp LINK_LIBRARIES lua) #dfhack_plugin(stocks stocks.cpp)
dfhack_plugin(tiletypes tiletypes.cpp Brushes.h LINK_LIBRARIES lua) dfhack_plugin(strangemood strangemood.cpp)
#dfhack_plugin(title-folder title-folder.cpp) dfhack_plugin(tailor tailor.cpp LINK_LIBRARIES lua)
#dfhack_plugin(trackstop trackstop.cpp) dfhack_plugin(tiletypes tiletypes.cpp Brushes.h LINK_LIBRARIES lua)
#dfhack_plugin(tubefill tubefill.cpp) #dfhack_plugin(title-folder title-folder.cpp)
#add_subdirectory(tweak) #dfhack_plugin(trackstop trackstop.cpp)
#dfhack_plugin(workflow workflow.cpp LINK_LIBRARIES lua) #dfhack_plugin(tubefill tubefill.cpp)
dfhack_plugin(work-now work-now.cpp) #add_subdirectory(tweak)
dfhack_plugin(xlsxreader xlsxreader.cpp LINK_LIBRARIES lua xlsxio_read_STATIC zip expat) #dfhack_plugin(workflow workflow.cpp LINK_LIBRARIES lua)
dfhack_plugin(zone zone.cpp LINK_LIBRARIES lua) dfhack_plugin(work-now work-now.cpp)
dfhack_plugin(xlsxreader xlsxreader.cpp LINK_LIBRARIES lua xlsxio_read_STATIC zip expat)
dfhack_plugin(zone zone.cpp LINK_LIBRARIES lua)
endif(BUILD_SUPPORTED)
# If you are adding a plugin that you do not intend to commit to the DFHack repo, # If you are adding a plugin that you do not intend to commit to the DFHack repo,
# see instructions for adding "external" plugins at the end of this file. # see instructions for adding "external" plugins at the end of this file.

@ -14,16 +14,16 @@ dfhack_plugin(frozen frozen.cpp)
dfhack_plugin(kittens kittens.cpp LINK_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} COMPILE_FLAGS_MSVC "/wd4316") dfhack_plugin(kittens kittens.cpp LINK_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} COMPILE_FLAGS_MSVC "/wd4316")
dfhack_plugin(memview memview.cpp memutils.cpp LINK_LIBRARIES lua) dfhack_plugin(memview memview.cpp memutils.cpp LINK_LIBRARIES lua)
dfhack_plugin(onceExample onceExample.cpp) dfhack_plugin(onceExample onceExample.cpp)
dfhack_plugin(renderer-msg renderer-msg.cpp) # dfhack_plugin(renderer-msg renderer-msg.cpp)
dfhack_plugin(rprobe rprobe.cpp) # dfhack_plugin(rprobe rprobe.cpp)
dfhack_plugin(stepBetween stepBetween.cpp) # dfhack_plugin(stepBetween stepBetween.cpp)
dfhack_plugin(stockcheck stockcheck.cpp) dfhack_plugin(stockcheck stockcheck.cpp)
dfhack_plugin(stripcaged stripcaged.cpp) dfhack_plugin(stripcaged stripcaged.cpp)
dfhack_plugin(tilesieve tilesieve.cpp) dfhack_plugin(tilesieve tilesieve.cpp)
dfhack_plugin(zoom zoom.cpp) # dfhack_plugin(zoom zoom.cpp)
if(UNIX) if(UNIX)
dfhack_plugin(ref-index ref-index.cpp) dfhack_plugin(ref-index ref-index.cpp)
endif() endif()
add_subdirectory(check-structures-sanity) # add_subdirectory(check-structures-sanity)