Commit 9404c11b authored by Ben Boeckel's avatar Ben Boeckel
Browse files

paraview: handle the removal of forward executables

parent 5dade580
...@@ -37,6 +37,10 @@ if (python_enabled) ...@@ -37,6 +37,10 @@ if (python_enabled)
pvbatch pvbatch
pvpython) pvpython)
endif () endif ()
if (mesa_enabled)
list(APPEND paraview_executables
paraview-mesa)
endif ()
set(paraview_has_gui FALSE) set(paraview_has_gui FALSE)
if (qt5_enabled) if (qt5_enabled)
......
...@@ -88,9 +88,9 @@ if (UNIX) ...@@ -88,9 +88,9 @@ if (UNIX)
genericio cosmotools) genericio cosmotools)
endif () endif ()
set(paraview_mesa_sb_available FALSE) set(paraview_mesa_libdir "<LIBDIR>")
if (PARAVIEW_DEFAULT_SYSTEM_GL AND mesa_enabled) if (PARAVIEW_DEFAULT_SYSTEM_GL AND mesa_enabled)
set(paraview_mesa_sb_available TRUE) set(paraview_mesa_libdir "<LIBDIR>/mesa")
endif () endif ()
if (WIN32) if (WIN32)
...@@ -181,8 +181,8 @@ superbuild_add_project(paraview ...@@ -181,8 +181,8 @@ superbuild_add_project(paraview
-DVTK_USE_X:BOOL=${paraview_use_x} -DVTK_USE_X:BOOL=${paraview_use_x}
# mesa flags # mesa flags
-DPARAVIEW_WITH_SUPERBUILD_MESA:BOOL=${paraview_mesa_sb_available} -DPARAVIEW_BUILD_MESA_LAUNCHER:BOOL=${mesa_enabled}
-DPARAVIEW_WITH_SUPERBUILD_MESA_SWR:BOOL=${mesa_USE_SWR} -DPARAVIEW_MESA_LIBDIR:STRING=${paraview_mesa_libdir}
# IndeX # IndeX
-DPARAVIEW_PLUGIN_ENABLE_pvNVIDIAIndeX:BOOL=${nvidiaindex_enabled} -DPARAVIEW_PLUGIN_ENABLE_pvNVIDIAIndeX:BOOL=${nvidiaindex_enabled}
......
...@@ -22,7 +22,7 @@ if (PARAVIEW_DEFAULT_SYSTEM_GL OR ...@@ -22,7 +22,7 @@ if (PARAVIEW_DEFAULT_SYSTEM_GL OR
endif () endif ()
foreach (executable IN LISTS paraview_executables) foreach (executable IN LISTS paraview_executables)
superbuild_unix_install_program_fwd("${executable}" superbuild_unix_install_program("${superbuild_install_location}/bin/${executable}"
"lib" "lib"
SEARCH_DIRECTORIES "${library_paths}" SEARCH_DIRECTORIES "${library_paths}"
INCLUDE_REGEXES ${include_regexes} INCLUDE_REGEXES ${include_regexes}
......
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