From: José Fonseca
Not actually necessary. rgbTriStrip test used it but it was just a proof
of concept, never part of any test list.
This greatly simplifies building piglit for Windows.
---
CMakeLists.txt|4 +-
README| 35 +---
tests/CMakeLists.txt |4 +-
tests/glean/CMakeLists.gl.txt |5 --
tests/glean/environ.h |3 +-
tests/glean/image.h | 16 +---
tests/glean/rdtiff.cpp| 156
tests/glean/trgbtris.cpp | 196 -
tests/glean/trgbtris.h| 63 -
tests/glean/wrtiff.cpp| 134
10 files changed, 6 insertions(+), 610 deletions(-)
delete mode 100644 tests/glean/rdtiff.cpp
delete mode 100644 tests/glean/trgbtris.cpp
delete mode 100644 tests/glean/trgbtris.h
delete mode 100644 tests/glean/wrtiff.cpp
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 689631d..98fa713 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,8 +10,6 @@ INCLUDE (FindPkgConfig)
project (piglit)
-find_package(TIFF)
-find_package(PNG REQUIRED)
find_package(X11)
@@ -50,7 +48,7 @@ else()
find_package(GLUT REQUIRED)
# The 'REQUIRED' above correctly produces an error for
- # OpenGL and PNG, but there's a bug involving FindGLUT.cmake
+ # OpenGL, but there's a bug involving FindGLUT.cmake
# that fails to produce the error as of CMake 2.8.5.
#
# Instead, CMake keeps going and eventually spams
diff --git a/README b/README
index c114023..68108c9 100644
--- a/README
+++ b/README
@@ -34,7 +34,6 @@ First of all, you need to make sure that the following are
installed:
- cmake (http://www.cmake.org)
- GL, glu and glut libraries and development packages (i.e. headers)
- X11 libraries and development packages (i.e. headers)
- - libpng, libtiff and related development packages (i.e. headers)
- waffle (http://people.freedesktop.org/~chadversary/waffle)
Now configure the build system:
@@ -62,7 +61,7 @@ invoke cmake with option "-DCMAKE_SYSTEM_PROCESSOR=i386".
--
Install development packages.
- $ sudo apt-get install cmake g++ mesa-common-dev libgl1-mesa-dev
libtiff4-dev zlib1g-dev libpng12-dev python-numpy freeglut3-dev x11proto-gl-dev
libxrender-dev
+ $ sudo apt-get install cmake g++ mesa-common-dev libgl1-mesa-dev
python-numpy freeglut3-dev x11proto-gl-dev libxrender-dev
Install additional components for which Ubuntu packages do not yet exist:
- waffle (http://people.freedesktop.org/~chadversary/waffle)
@@ -87,19 +86,8 @@ Configure and build.
$ make
glean
-In order to build glean, TIFF is required but not included as part of
-Xcode. TIFF must be obtained elsewhere and one solution is to get TIFF
-from MacPorts.
-Install MacPorts.
-http://www.macports.org/install.php
-
-Install TIFF through MacPorts. The '+universal' option is needed as
-glean cannot be built as x86_64, only as i386.
- $ sudo port selfupdate
- $ sudo port install tiff +universal
-
-glean will also not build with MacOSX10.7.sdk. If you are trying to
+glean will not build with MacOSX10.7.sdk. If you are trying to
build glean on Mac OS 10.7 (Lion), you will have to use MacOSX10.6.sdk.
$ ccmake .
Set 'CMAKE_OSX_SYSROOT' to '/Developer/SDKs/MacOSX10.6.sdk'. Configure.
@@ -116,10 +104,6 @@ Install development packages.
- make
- opengl
- libGL-devel
- - libpng12-devel
- - libpng14-devel
- - zlib-devel
- - libtiff-devel
- python
- python-numpy
- libglut-devel
@@ -146,15 +130,6 @@ Download and install 'Windows' platform.
Install Microsoft Visual Studio.
Install 'Visual C++' feature.
-Install TIFF for Windows.
-http://gnuwin32.sourceforge.net/packages/tiff.htm
-
-Install Zlib for Windows.
-http://gnuwin32.sourceforge.net/packages/zlib.htm
-
-Install LibPng for Windows.
-http://gnuwin32.sourceforge.net/packages/libpng.htm
-
Download OpenGL Core API and Extension Header Files.
http://www.opengl.org/registry/#headers
Copy header files to MSVC.
@@ -173,12 +148,6 @@ Configure
- NMake Makefiles
- Use default native compilers
Set these variables in the Advanced view.
- - TIFF_INCLUDE_DIR
- - TIFF_LIBRARY
- - ZLIB_INCLUDE_DIR
- - ZLIB_LIBRARY
- - PNG_PNG_INCLUDE_DIR
- - PNG_LIBRARY
- GLUT_INCLUDE_DIR
- GLUT_glut_LIBRARY
Configure
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c38a72d..a85af2a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -16,9 +16,7 @@ add_subdirectory (shaders)
add_subdirectory (texturing)
add_subdirectory (spec)
-if (TIFF_FOUND)
- add_subdirectory (glean)
-endif (TIFF_FOUND)
+add_subdirectory (glean)
IF(OPENGL_egl_LIBRARY)
add_subdirectory (egl)
diff --git a/tests/glean/CMakeLists.gl.txt b/tests/glean/CMakeLists.gl.txt
index 3485b42..b510f36 100644
--- a/tests/glean/CMakeLists.gl.txt
+++ b/tests/glean/CMakeLists.gl.txt
@@ -1
