Commit 7b37db13 authored by Ben Boeckel's avatar Ben Boeckel
Browse files

vortexfinder2: update for new cmake code

parent 3d2a02c0
......@@ -106,6 +106,11 @@ foreach (paraview_plugin_line IN LISTS paraview_plugin_lines)
"${paraview_plugin}")
endforeach ()
if (vortexfinder2_enabled)
list(APPEND paraview_plugins
VortexFinder)
endif ()
if (osmesa_built_by_superbuild OR mesa_built_by_superbuild)
set(mesa_libraries)
if (mesa_built_by_superbuild)
......
......@@ -21,8 +21,7 @@ if (WIN32 OR APPLE OR osmesa_enabled OR egl_enabled)
set(paraview_use_x OFF)
endif()
set(paraview_all_plugins
vortexfinder2)
set(paraview_all_plugins)
if (superbuild_build_phase)
get_property(paraview_plugins GLOBAL
......
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 9940102..cd7ce0a 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -40,6 +40,10 @@ set (common_protos
Puncture.proto
)
+if (APPLE AND NOT PARAVIEW_DO_UNIX_STYLE_INSTALL)
+ set(CMAKE_INSTALL_NAME_DIR "@loader_path/../Libraries")
+endif ()
+
add_library (glcommon SHARED ${common_sources} ${common_proto_sources})
target_include_directories(glcommon PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
paraview_add_plugin(vortexfinder2
PLUGIN_NAME VortexFinder2
DEPENDS boost qt5 cxx11)
superbuild_add_project(vortexfinder2
DEPENDS paraview
CMAKE_ARGS
-DWITH_PARAVIEW:BOOL=ON
-DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-DCMAKE_MACOSX_RPATH:BOOL=FALSE
-DCMAKE_INSTALL_NAME_DIR:PATH=<INSTALL_DIR>/lib
-DCMAKE_INSTALL_LIBDIR:STRING=lib
-DPARAVIEW_DO_UNIX_STYLE_INSTALL:BOOL=ON
-DWITH_MACOS_RPATH:BOOL=FALSE)
superbuild_add_extra_cmake_args(
-DWITH_MACOS_RPATH:BOOL=FALSE)
# https://github.com/hguo/vortexfinder2/pull/9
superbuild_apply_patch(vortexfinder2 loader-path
"Use @loader_path on macOS")
if (APPLE)
# On Apple, only libc++ has the <tuple> header in older SDKs. For the use of
# libc++.
superbuild_append_flags(cxx_flags -stdlib=libc++ PROJECT_ONLY)
endif ()
......@@ -3,14 +3,7 @@
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuTools" />
<pqevent object="pqClientMainWindow/menubar/menuTools" command="activate" arguments="actionManage_Plugins" />
<pqevent object="pqClientMainWindow/PluginManagerDialog/localGroup/localPlugins" command="setCurrent" arguments="AcceleratedAlgorithms" />
<pqevent object="pqClientMainWindow/PluginManagerDialog/localGroup/localPlugins" command="setCurrent" arguments="GLGPUSupercurrentFilter" />
<pqevent object="pqClientMainWindow/PluginManagerDialog/localGroup/loadSelected_Local" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/PluginManagerDialog/localGroup/localPlugins" command="setCurrent" arguments="GLGPUVortexFilter" />
<pqevent object="pqClientMainWindow/PluginManagerDialog/localGroup/loadSelected_Local" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/PluginManagerDialog/localGroup/localPlugins" command="setCurrent" arguments="BDATReader" />
<pqevent object="pqClientMainWindow/PluginManagerDialog/localGroup/loadSelected_Local" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/PluginManagerDialog/localGroup/localPlugins" command="setCurrent" arguments="GLGPUSupercurrentFilter" />
<pqevent object="pqClientMainWindow/PluginManagerDialog/localGroup/localPlugins" command="setCurrent" arguments="BDATSeriesReader" />
<pqevent object="pqClientMainWindow/PluginManagerDialog/localGroup/localPlugins" command="setCurrent" arguments="VortexFinder" />
<pqevent object="pqClientMainWindow/PluginManagerDialog/localGroup/loadSelected_Local" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/PluginManagerDialog/buttonBox/1QPushButton0" command="activate" arguments="" />
<pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuFilters" />
......
......@@ -68,8 +68,8 @@ superbuild_set_revision(vrpn
superbuild_set_revision(vortexfinder2
# https://github.com/hguo/vortexfinder2.git
URL "https://www.paraview.org/files/dependencies/vortexfinder2-f9a31847c052a44cc1e4b592b9e3f3fe078b7bf9.tar.bz2"
URL_MD5 da96a038e00d08e4571f64488e9e4d16)
URL "https://www.paraview.org/files/dependencies/vortexfinder2-bb76f80ad08223d49fb42e828c1416daa19f7ecb.tar.bz2"
URL_MD5 47d12a5103d66b5db782c43c5255b26b)
#------------------------------------------------------------------------------
# Optional Plugins. Doesn't affect ParaView binaries at all even if missing
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment