mirror of https://git.wownero.com/dsc/mxe.git
Merge pull request #238 from sikoragmbh/vtk6-fix-gl
package vtk6: fix native opengl dependency
This commit is contained in:
commit
1ab562cde2
|
@ -4,7 +4,7 @@
|
||||||
PKG := sqlite
|
PKG := sqlite
|
||||||
$(PKG)_IGNORE :=
|
$(PKG)_IGNORE :=
|
||||||
$(PKG)_VERSION := 3080000
|
$(PKG)_VERSION := 3080000
|
||||||
$(PKG)_CHECKSUM := 610d01764c2fc6c6220ab88a57ac4de86515ebc8
|
$(PKG)_CHECKSUM := 94280dbeeb24e22bcfa492a48226cabad2e32208
|
||||||
$(PKG)_SUBDIR := $(PKG)-autoconf-$($(PKG)_VERSION)
|
$(PKG)_SUBDIR := $(PKG)-autoconf-$($(PKG)_VERSION)
|
||||||
$(PKG)_FILE := $(PKG)-autoconf-$($(PKG)_VERSION).tar.gz
|
$(PKG)_FILE := $(PKG)-autoconf-$($(PKG)_VERSION).tar.gz
|
||||||
$(PKG)_URL := http://www.sqlite.org/2013/$($(PKG)_FILE)
|
$(PKG)_URL := http://www.sqlite.org/2013/$($(PKG)_FILE)
|
||||||
|
|
|
@ -12,3 +12,36 @@
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# FIXME: The TDx support needs some refactoring before we can build it in a
|
# FIXME: The TDx support needs some refactoring before we can build it in a
|
||||||
|
@@ -136,7 +136,7 @@
|
||||||
|
|
||||||
|
if(VTK_USE_OSMESA)
|
||||||
|
find_package(OpenGL)
|
||||||
|
-else()
|
||||||
|
+elseif(VTK_USE_X)
|
||||||
|
find_package(OpenGL REQUIRED)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
--- VTK6.0.0/ThirdParty/gl2ps/vtkgl2ps/CMakeLists.txt 2013-06-12 21:47:10.000000000 +0200
|
||||||
|
+++ VTK6.0.0/ThirdParty/gl2ps/vtkgl2ps/CMakeLists.txt 2013-08-28 13:45:16.297181334 +0200
|
||||||
|
@@ -4,16 +4,16 @@
|
||||||
|
include_regular_expression(".*")
|
||||||
|
|
||||||
|
# Depend on OpenGL
|
||||||
|
-if(NOT VTK_OPENGL_HAS_OSMESA)
|
||||||
|
- find_package(OpenGL REQUIRED)
|
||||||
|
- set(GL2PS_GL_LIBRARIES ${OPENGL_LIBRARIES})
|
||||||
|
- set(GL2PS_GL_INCLUDE_DIR ${OPENGL_INCLUDE_DIR})
|
||||||
|
-else()
|
||||||
|
+if(VTK_OPENGL_HAS_OSMESA)
|
||||||
|
set(GL2PS_GL_LIBRARIES ${OSMESA_LIBRARY})
|
||||||
|
set(GL2PS_GL_INCLUDE_DIR ${OSMESA_INCLUDE_DIR})
|
||||||
|
if(OPENGL_gl_LIBRARY)
|
||||||
|
list(APPEND GL2PS_GL_LIBRARIES ${OPENGL_gl_LIBRARY})
|
||||||
|
endif()
|
||||||
|
+elseif(VTK_USE_X)
|
||||||
|
+ find_package(OpenGL REQUIRED)
|
||||||
|
+ set(GL2PS_GL_LIBRARIES ${OPENGL_LIBRARIES})
|
||||||
|
+ set(GL2PS_GL_INCLUDE_DIR ${OPENGL_INCLUDE_DIR})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# Need math on UNIX
|
||||||
|
|
|
@ -25,11 +25,9 @@ define $(PKG)_BUILD
|
||||||
mkdir '$(1).native_build'
|
mkdir '$(1).native_build'
|
||||||
cd '$(1).native_build' && cmake \
|
cd '$(1).native_build' && cmake \
|
||||||
-DBUILD_TESTING=FALSE \
|
-DBUILD_TESTING=FALSE \
|
||||||
-DVTK_USE_RENDERING=FALSE \
|
|
||||||
-DVTK_USE_X=FALSE \
|
-DVTK_USE_X=FALSE \
|
||||||
-DVTK_Group_Rendering=FALSE \
|
|
||||||
-DCMAKE_BUILD_TYPE="Release" \
|
|
||||||
-DVTK_USE_OSMESA=FALSE \
|
-DVTK_USE_OSMESA=FALSE \
|
||||||
|
-DCMAKE_BUILD_TYPE="Release" \
|
||||||
'$(1)'
|
'$(1)'
|
||||||
$(MAKE) -C '$(1).native_build' -j '$(JOBS)' VERBOSE=1 vtkCompileTools
|
$(MAKE) -C '$(1).native_build' -j '$(JOBS)' VERBOSE=1 vtkCompileTools
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue