Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Utkarsh Ayachit
ParaView-Superbuild
Commits
27d19f4e
Commit
27d19f4e
authored
Sep 07, 2016
by
Ben Boeckel
Browse files
manta: remove from the project
It is no longer necessary.
parent
1f1f01dc
Changes
8
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
27d19f4e
...
...
@@ -50,11 +50,6 @@ function (superbuild_find_projects var)
xdmf3
zlib
)
if
(
NOT APPLE
)
list
(
APPEND projects
manta
)
endif
()
if
(
UNIX
)
list
(
APPEND projects
adios
...
...
@@ -141,10 +136,6 @@ function (superbuild_sanity_check)
if
(
paraview_enabled AND catalyst_enabled
)
message
(
SEND_ERROR
"Cannot enable ParaView and Catalyst at the same time."
)
endif
()
if
(
paraview_enabled AND manta_enabled AND PARAVIEW_RENDERING_BACKEND STREQUAL
"OpenGL2"
)
message
(
SEND_ERROR
"Manta does not work with OpenGL2"
)
endif
()
endfunction
()
function
(
superbuild_add_packaging
)
...
...
projects/manta.cmake
deleted
100644 → 0
View file @
1f1f01dc
superbuild_add_project
(
manta
DEPENDS libxml2 zlib
CMAKE_ARGS
-DBUILD_SHARED_LIBS:BOOL=
${
BUILD_SHARED_LIBS
}
-DBUILD_TESTING:BOOL=OFF
-DMANTA_ENABLE_X11:BOOL=OFF
-DSCENE_0:BOOL=OFF
-DSCENE_AREA_LIGHT:BOOL=OFF
-DSCENE_BEACH:BOOL=OFF
-DSCENE_COMPLEXITYTEST:BOOL=OFF
-DSCENE_CUBE_WORLD:BOOL=OFF
-DSCENE_EXTERNAL_OBJECT:BOOL=OFF
-DSCENE_FENCE:BOOL=OFF
-DSCENE_GALILEO:BOOL=OFF
-DSCENE_GRIDISOVOL:BOOL=OFF
-DSCENE_HDRI:BOOL=OFF
-DSCENE_MACBETH:BOOL=OFF
-DSCENE_OCTISOVOL:BOOL=OFF
-DSCENE_PRIMTEST:BOOL=OFF
-DSCENE_SOFT_SHADOW:BOOL=OFF
-DSCENE_TEAPOT_ROOM:BOOL=OFF
-DSCENE_TRIANGLESCENEVIEWER:BOOL=OFF
-DSCENE_TYLENOL:BOOL=OFF
-DSCENE_VALUE_COLORMAP:BOOL=OFF
-DSCENE_VORPAL:BOOL=OFF
# turn off SSE on 32-bit builds.
-DMANTA_SSE:BOOL=
${
superbuild_is_64bit
}
INSTALL_COMMAND
"
${
CMAKE_COMMAND
}
"
-E copy_directory
<BINARY_DIR>/lib
<INSTALL_DIR>/lib
)
projects/paraview.bundle.common.cmake
View file @
27d19f4e
...
...
@@ -117,11 +117,6 @@ if (paraview_has_gui)
SierraPlotTools
)
endif
()
if
(
manta_enabled
)
list
(
APPEND paraview_plugins
MantaView
)
endif
()
if
(
vortexfinder2_enabled
)
list
(
APPEND paraview_plugins
BDATReader
...
...
projects/paraview.cmake
View file @
27d19f4e
...
...
@@ -3,14 +3,6 @@ set(PARAVIEW_EXTRA_CMAKE_ARGUMENTS ""
mark_as_advanced
(
PARAVIEW_EXTRA_CMAKE_ARGUMENTS
)
set
(
paraview_extra_cmake_options
)
if
(
manta_enabled AND TARGET manta
)
set
(
manta_binary_dir
"<BINARY_DIR>"
)
_ep_replace_location_tags
(
manta manta_binary_dir
)
list
(
APPEND paraview_extra_cmake_options
-DMANTA_BUILD:PATH=
${
manta_binary_dir
}
)
endif
()
if
(
PV_NIGHTLY_SUFFIX
)
list
(
APPEND paraview_extra_cmake_options
-DPV_NIGHTLY_SUFFIX:STRING=
${
PV_NIGHTLY_SUFFIX
}
)
...
...
@@ -100,11 +92,6 @@ if (UNIX)
genericio cosmotools
)
endif
()
if
(
NOT APPLE
)
list
(
APPEND paraviews_platform_dependencies
manta
)
endif
()
superbuild_add_project
(
paraview
DEBUGGABLE
DEFAULT_ON
...
...
@@ -123,7 +110,6 @@ superbuild_add_project(paraview
-DBUILD_TESTING:BOOL=OFF
-DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=ON
-DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON
-DPARAVIEW_BUILD_PLUGIN_MantaView:BOOL=
${
manta_enabled
}
-DPARAVIEW_BUILD_QT_GUI:BOOL=
${
paraview_use_qt
}
-DPARAVIEW_ENABLE_FFMPEG:BOOL=
${
ffmpeg_enabled
}
-DPARAVIEW_ENABLE_PYTHON:BOOL=
${
python_enabled
}
...
...
projects/unix/manta.cmake
deleted
100644 → 0
View file @
1f1f01dc
include
(
"
${
CMAKE_CURRENT_LIST_DIR
}
/../manta.cmake"
)
superbuild_apply_patch
(
manta fix-missing-includes
"Add missing includes of unistd.h"
)
superbuild_apply_patch
(
manta fix-missing-link
"Link to the dl library"
)
projects/unix/patches/manta-fix-missing-includes.patch
deleted
100644 → 0
View file @
1f1f01dc
diff -Nr -U5 manta-r2439/Core/Containers/Array3.h manta-r2439.fix-missing-includes/Core/Containers/Array3.h
--- manta-r2439/Core/Containers/Array3.h 2010-12-29 11:43:30.000000000 -0500
+++ manta-r2439.fix-missing-includes/Core/Containers/Array3.h 2015-12-02 16:19:30.385774756 -0500
@@ -49,10 +49,14 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <Core/Util/Assert.h>
+#if defined(__GNUC__) && defined(__linux)
+#include <unistd.h>
+#endif
+
namespace Manta {
/**************************************
CLASS
diff -Nr -U5 manta-r2439/Core/Thread/Thread.cc manta-r2439.fix-missing-includes/Core/Thread/Thread.cc
--- manta-r2439/Core/Thread/Thread.cc 2010-12-29 11:43:30.000000000 -0500
+++ manta-r2439.fix-missing-includes/Core/Thread/Thread.cc 2015-12-02 16:19:40.672085924 -0500
@@ -59,10 +59,12 @@
# include <strings.h>
#endif
#include <string.h>
#include <sys/types.h>
+#include <unistd.h>
+
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <winnt.h>
#include <io.h>
projects/unix/patches/manta-fix-missing-link.patch
deleted
100644 → 0
View file @
1f1f01dc
diff -Nr -U5 manta-r2439/Core/CMakeLists.txt manta-r2439.fix-missing-link/Core/CMakeLists.txt
--- manta-r2439/Core/CMakeLists.txt 2010-12-29 11:43:31.000000000 -0500
+++ manta-r2439.fix-missing-link/Core/CMakeLists.txt 2015-12-02 16:19:44.493201515 -0500
@@ -180,10 +180,14 @@
Util/UpdateGraph.h
)
ADD_LIBRARY (Manta_Core ${CORE_SOURCES})
+IF (UNIX AND NOT APPLE)
+ TARGET_LINK_LIBRARIES(Manta_Core dl)
+ENDIF()
+
IF(LIBXML2_FOUND)
TARGET_LINK_LIBRARIES(Manta_Core ${LIBXML2_LIBRARY})
ENDIF(LIBXML2_FOUND)
IF (CMAKE_USE_PTHREADS_INIT)
versions.cmake
View file @
27d19f4e
...
...
@@ -2,10 +2,6 @@ superbuild_set_revision(llvm
URL
"http://paraview.org/files/dependencies/llvm-3.8.1.src.tar.xz"
URL_MD5 538467e6028bbc9259b1e6e015d25845
)
superbuild_set_revision
(
manta
URL
"http://paraview.org/files/dependencies/manta-r2439.tar.gz"
URL_MD5 fbf4107fe2f6d7e8a5ae3dda71805bdc
)
superbuild_set_revision
(
mesa
URL
"http://paraview.org/files/dependencies/mesa-12.0.1.tar.xz"
URL_MD5 972fd5ad5a63aeabf173fb9adefc6522
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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