Commit 123b4bb4 authored by Ben Boeckel's avatar Ben Boeckel
Browse files

glu: remove from the superbuild

It is no longer required.
parent 8c380916
......@@ -86,7 +86,6 @@ function (superbuild_find_projects var)
catalyst
egl
fontconfig
glu
glproto
llvm
mesa
......
......@@ -88,7 +88,7 @@ set(paraviews_platform_dependencies)
if (UNIX)
if (NOT APPLE)
list(APPEND paraviews_platform_dependencies
mesa osmesa egl glu
mesa osmesa egl
boxlib
......
if (BUILD_SHARED_LIBS)
set(glu_flags --disable-static --enable-shared)
set(glu_library libGLU.so)
else ()
set(glu_flags --enable-static --disable-shared)
set(glu_library libGLU.a)
endif ()
superbuild_add_project(glu
CAN_USE_SYSTEM
DEPENDS_OPTIONAL mesa
CONFIGURE_COMMAND
<SOURCE_DIR>/configure
--prefix=<INSTALL_DIR>
${glu_flags}
BUILD_COMMAND
$(MAKE)
INSTALL_COMMAND
make install
BUILD_IN_SOURCE 1)
superbuild_add_extra_cmake_args(
-DOPENGL_glu_LIBRARY:FILEPATH=<INSTALL_DIR>/lib/${glu_library})
find_package(OpenGL REQUIRED)
if (NOT OPENGL_GLU_FOUND)
message(FATAL_ERROR "Failed to find `GLU`.")
endif ()
superbuild_add_extra_cmake_args(
-DOPENGL_glu_LIBRARY:FILEPATH=${OPENGL_glu_LIBRARY})
......@@ -5,6 +5,5 @@ superbuild_add_extra_cmake_args(
-DOPENGL_INCLUDE_DIR:PATH=IGNORE
-DOPENGL_xmesa_INCLUDE_DIR:PATH=IGNORE
-DOPENGL_gl_LIBRARY:FILEPATH=IGNORE
-DOPENGL_glu_LIBRARY:FILEPATH=IGNORE
-DOSMESA_INCLUDE_DIR:PATH=${OSMESA_INCLUDE_DIR}
-DOSMESA_LIBRARY:FILEPATH=${OSMESA_LIBRARY})
if (UNIX AND NOT APPLE)
superbuild_add_dummy_project(visitbridge
DEPENDS boost glu)
else ()
superbuild_add_dummy_project(visitbridge
DEPENDS boost)
endif ()
superbuild_add_dummy_project(visitbridge
DEPENDS boost)
......@@ -12,10 +12,6 @@ superbuild_set_revision(mesa
get_property(mesa_revision GLOBAL PROPERTY mesa_revision)
superbuild_set_revision(osmesa ${mesa_revision})
superbuild_set_revision(glu
URL "http://www.paraview.org/files/dependencies/glu-9.0.0.tar.gz"
URL_MD5 bbc57d4fe3bd3fb095bdbef6fcb977c4)
superbuild_set_revision(adios
URL "http://www.paraview.org/files/dependencies/adios-1.11.0.tar.gz"
URL_MD5 5eead5b2ccf962f5e6d5f254d29d5238)
......
Supports Markdown
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