Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ParaView
ParaView-Superbuild
Commits
7b37db13
Commit
7b37db13
authored
Mar 29, 2019
by
Ben Boeckel
⛰
Browse files
vortexfinder2: update for new cmake code
parent
3d2a02c0
Changes
6
Hide whitespace changes
Inline
Side-by-side
projects/paraview.bundle.common.cmake
View file @
7b37db13
...
...
@@ -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
)
...
...
projects/paraview.cmake
View file @
7b37db13
...
...
@@ -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
...
...
projects/patches/vortexfinder2-loader-path.patch
deleted
100644 → 0
View file @
3d2a02c0
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})
projects/vortexfinder2.cmake
View file @
7b37db13
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
()
tests/xml/LoadVortexFinderPlugins.xml
View file @
7b37db13
...
...
@@ -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"
/>
...
...
versions.cmake
View file @
7b37db13
...
...
@@ -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
...
...
Ben Boeckel
⛰
@ben.boeckel
mentioned in commit
4d542fc5
·
Apr 04, 2019
mentioned in commit
4d542fc5
mentioned in commit 4d542fc550d015280da5f5195375987989028fdb
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment