Skip to content

Commit

Permalink
🔧 add full path for xml files
Browse files Browse the repository at this point in the history
  • Loading branch information
FellegaraR committed Oct 6, 2020
1 parent d831d3f commit 49c8227
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
13 changes: 11 additions & 2 deletions src/plugins/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@ set(VESTEC_VTK_MODULE_FILES "" ) #CACHE INTERNAL "")

function(vestec_register_paraview_plugin moduleName moduleXML)
message("[VESTEC] Register module: " ${moduleName} " " ${moduleXML})
list(APPEND VESTEC_XMLS ${moduleXML})
# replace variables of original XML file and store generated file in build dir
configure_file(${CMAKE_CURRENT_LIST_DIR}/${moduleXML} ${CMAKE_BINARY_DIR}/paraview/xmls/${moduleXML})

# use generated xml file for pv plugin
list(APPEND VESTEC_XMLS ${CMAKE_BINARY_DIR}/paraview/xmls/${moduleXML})
# list(APPEND VESTEC_XMLS ${moduleXML})
set(VESTEC_XMLS ${VESTEC_XMLS} PARENT_SCOPE)
list(APPEND VESTEC_MODULES ${moduleName})
set(VESTEC_MODULES ${VESTEC_MODULES} PARENT_SCOPE)
Expand Down Expand Up @@ -109,6 +114,10 @@ paraview_plugin_scan(
)

message("BUILD")
message("RUNTIME_DESTINATION " ${CMAKE_INSTALL_BINDIR})
message("LIBRARY_DESTINATION " ${CMAKE_INSTALL_LIBDIR})
message("LIBRARY_SUBDIRECTORY " ${PARAVIEW_PLUGIN_SUBDIR})
message("VESTEC_INSTALL_PLUGIN_DIR " ${VESTEC_INSTALL_PLUGIN_DIR})

paraview_plugin_build(
TARGET
Expand Down Expand Up @@ -140,5 +149,5 @@ install(
VESTECPVTargets
DESTINATION
"${VESTEC_INSTALL_PLUGIN_DIR}"
)
)

2 changes: 0 additions & 2 deletions src/plugins/singlePlugin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,8 @@ paraview_add_plugin(VestecPlugins
${VESTEC_VTK_MODULE_FILES}
MODULE_ARGS # BUG: see above
INSTALL_HEADERS ON
# ${VESTEC_LINKS}
SERVER_MANAGER_XML
${VESTEC_XMLS}
# SOURCES ${VESTEC_SOURCES}
)

if(NOT "${VESTEC_INSTALL_PLUGIN_DIR}" STREQUAL "")
Expand Down

0 comments on commit 49c8227

Please sign in to comment.