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,6 +75,8 @@ 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.
option(BUILD_SUPPORTED "Build the supported plugins (reveal, probe, etc.)." ON)
if(BUILD_SUPPORTED)
dfhack_plugin(3dveins 3dveins.cpp) dfhack_plugin(3dveins 3dveins.cpp)
dfhack_plugin(add-spatter add-spatter.cpp) dfhack_plugin(add-spatter add-spatter.cpp)
dfhack_plugin(autobutcher autobutcher.cpp LINK_LIBRARIES lua) dfhack_plugin(autobutcher autobutcher.cpp LINK_LIBRARIES lua)
@ -171,6 +173,7 @@ dfhack_plugin(tiletypes tiletypes.cpp Brushes.h LINK_LIBRARIES lua)
dfhack_plugin(work-now work-now.cpp) dfhack_plugin(work-now work-now.cpp)
dfhack_plugin(xlsxreader xlsxreader.cpp LINK_LIBRARIES lua xlsxio_read_STATIC zip expat) dfhack_plugin(xlsxreader xlsxreader.cpp LINK_LIBRARIES lua xlsxio_read_STATIC zip expat)
dfhack_plugin(zone zone.cpp LINK_LIBRARIES lua) 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)