Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BUG: Fix issue where some plugins were not getting wrapped with Python #773

Merged
merged 1 commit into from
Nov 22, 2023
Merged

BUG: Fix issue where some plugins were not getting wrapped with Python #773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions cmake/Summary.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,24 +73,25 @@ message(STATUS "* COMPLEX_BUILD_DOCS: ${COMPLEX_BUILD_DOCS}")
message(STATUS "* DREAM3D_DATA_DIR: ${DREAM3D_DATA_DIR}")

message(STATUS "* -------------- Complex Python Configuration Options -------------------------------------")
message(STATUS "* Python3_EXECUTABLE: ${Python3_EXECUTABLE}")
message(STATUS "* COMPLEX_BUILD_PYTHON: ${COMPLEX_BUILD_PYTHON}")
message(STATUS "* COMPLEX_EMBED_PYTHON: ${COMPLEX_EMBED_PYTHON}")
message(STATUS "* Python3_EXECUTABLE: ${Python3_EXECUTABLE}")
message(STATUS "* COMPLEX_ENABLE_SPHINX_DOCS: ${COMPLEX_ENABLE_SPHINX_DOCS}")

message(STATUS "* -------------- Known Plugins ------------------------------------------------------")
foreach(plugin ${COMPLEX_PLUGIN_LIST})
message(STATUS "* COMPLEX_PLUGIN_ENABLE_${plugin}: ${COMPLEX_PLUGIN_ENABLE_${plugin}}")
endforeach()
# message(STATUS "* -------------- Known Plugins ------------------------------------------------------")
# foreach(plugin ${COMPLEX_PLUGIN_LIST})
# message(STATUS "* COMPLEX_PLUGIN_ENABLE_${plugin}: ${COMPLEX_PLUGIN_ENABLE_${plugin}}")
# endforeach()

message(STATUS "* -------------- Active Plugins ------------------------------------------------------")
message(STATUS "* -------------- Plugins ------------------------------------------------------")
get_property(ComplexPluginTargets GLOBAL PROPERTY ComplexPluginTargets)
foreach(d3dPlugin ${ComplexPluginTargets})
foreach(d3dPlugin ${COMPLEX_PLUGIN_LIST})
get_property(PluginNumFilters GLOBAL PROPERTY ${d3dPlugin}_filter_count)
get_property(PluginGitHash GLOBAL PROPERTY ${d3dPlugin}_GIT_HASH)
get_property(PluginCommitDate GLOBAL PROPERTY ${d3dPlugin}_GIT_COMMIT_DATE)
get_property(PluginDocsEnabled GLOBAL PROPERTY ${d3dPlugin}_docs_enabled)
message(STATUS "* ${d3dPlugin}: [${COMPLEX_PLUGIN_ENABLE_${d3dPlugin}}] ${PluginNumFilters} Filters Docs:[${PluginDocsEnabled}]")
message(STATUS "* ${d3dPlugin}: [${COMPLEX_PLUGIN_ENABLE_${d3dPlugin}}] ${PluginNumFilters} Filters")

endforeach()

message(STATUS "* ======================================================================")
5 changes: 3 additions & 2 deletions wrapping/python/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,10 +261,11 @@ endfunction()

get_property(ComplexPluginTargets GLOBAL PROPERTY ComplexPluginTargets)
foreach(d3dPlugin ${ComplexPluginTargets})
# message(STATUS "PYTHON: Checking Plugin ${d3dPlugin}")
string(TOLOWER ${d3dPlugin} python_module_name)
if(NOT "${d3dPlugin}" STREQUAL "ComplexCore")
if(COMPLEX_ENABLE_${d3dPlugin})
message(STATUS "PYTHON: Wrapping ${d3dPlugin}")
if(COMPLEX_PLUGIN_ENABLE_${d3dPlugin})
message(STATUS "PYTHON: Wrapping Plugin ${d3dPlugin}")
complex_add_python_plugin(PLUGIN_NAME ${d3dPlugin} PYTHON_MODULE_NAME ${python_module_name})
endif()
endif()
Expand Down
Loading