From 49c822703b14073c39cbc6a9e0d397f58f9800d2 Mon Sep 17 00:00:00 2001 From: Fellegara Date: Tue, 6 Oct 2020 17:04:03 +0200 Subject: [PATCH] :wrench: add full path for xml files --- src/plugins/CMakeLists.txt | 13 +++++++++++-- src/plugins/singlePlugin/CMakeLists.txt | 2 -- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index d67bd19..914caf4 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -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) @@ -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 @@ -140,5 +149,5 @@ install( VESTECPVTargets DESTINATION "${VESTEC_INSTALL_PLUGIN_DIR}" - ) +) diff --git a/src/plugins/singlePlugin/CMakeLists.txt b/src/plugins/singlePlugin/CMakeLists.txt index 31ec1bd..a3ff525 100644 --- a/src/plugins/singlePlugin/CMakeLists.txt +++ b/src/plugins/singlePlugin/CMakeLists.txt @@ -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 "")