Commit c9bc190f authored by Jose Fonseca's avatar Jose Fonseca

Make TIFF an optional dependency.

It's only used by glean, so no need to force linking against it everywhere.
parent 77ebf85d
......@@ -7,7 +7,7 @@ INCLUDE (CheckIncludeFile)
project (piglit)
find_package(OpenGL REQUIRED)
find_package(TIFF REQUIRED)
find_package(TIFF)
find_package(GLUT REQUIRED)
find_package(PNG REQUIRED)
find_package(X11)
......
......@@ -2,7 +2,6 @@ add_subdirectory (util)
add_subdirectory (bugs)
add_subdirectory (fbo)
add_subdirectory (general)
add_subdirectory (glean)
add_subdirectory (gles2)
add_subdirectory (glx)
add_subdirectory (glslparsertest)
......@@ -12,6 +11,10 @@ add_subdirectory (shaders)
add_subdirectory (texturing)
add_subdirectory (spec)
if (TIFF_FOUND)
add_subdirectory (glean)
endif (TIFF_FOUND)
IF(OPENGL_egl_LIBRARY)
add_subdirectory (egl)
ENDIF(OPENGL_egl_LIBRARY)
......
......@@ -12,7 +12,6 @@ link_libraries (
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
${TIFF_LIBRARY}
)
add_executable (crash-cubemap-order crash-cubemap-order.c)
......
......@@ -12,7 +12,6 @@ link_libraries (
${OPENGL_glu_LIBRARY}
${OPENGL_egl_LIBRARY}
${GLUT_glut_LIBRARY}
${TIFF_LIBRARY}
)
IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
......
......@@ -12,7 +12,6 @@ link_libraries (
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
${TIFF_LIBRARY}
)
add_executable (fbo-1d fbo-1d.c)
......
......@@ -11,7 +11,6 @@ link_libraries (
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
${TIFF_LIBRARY}
)
add_executable (bgra-vert-attrib-pointer bgra-vert-attrib-pointer.c)
......
......@@ -11,7 +11,6 @@ link_libraries (
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
${TIFF_LIBRARY}
${X11_X11_LIB}
)
......
......@@ -18,7 +18,6 @@ link_libraries (
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
${TIFF_LIBRARY}
)
IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
......
......@@ -11,7 +11,6 @@ link_libraries (
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
${PNG_LIBRARIES}
${TIFF_LIBRARY}
mesautil
)
......
......@@ -9,7 +9,6 @@ link_libraries (
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
${TIFF_LIBRARY}
${PNG_LIBRARIES}
)
add_definitions (
......
......@@ -12,7 +12,6 @@ link_libraries (
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
${TIFF_LIBRARY}
)
add_executable (activeprogram-bad-program activeprogram-bad-program.c)
......
......@@ -9,7 +9,6 @@ link_libraries (
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
${TIFF_LIBRARY}
)
add_executable (amd_seamless_cubemap_per_texture amd_seamless_cubemap_per_texture.c)
......
......@@ -11,7 +11,6 @@ link_libraries (
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
${TIFF_LIBRARY}
)
add_executable (arb_color_buffer_float-getteximage getteximage.c)
......
......@@ -12,7 +12,6 @@ link_libraries (
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
${TIFF_LIBRARY}
)
add_executable (arb_es2_compatibility-depthrangef arb_es2_compatibility-depthrangef.c)
......
......@@ -9,7 +9,6 @@ link_libraries (
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
${TIFF_LIBRARY}
)
add_executable (instanced_arrays instanced_arrays.c)
......
......@@ -11,7 +11,6 @@ link_libraries (
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
${TIFF_LIBRARY}
)
add_executable (arb_robustness_draw-vbo-bounds draw-vbo-bounds.c)
......
......@@ -10,7 +10,6 @@ link_libraries (
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
${TIFF_LIBRARY}
)
add_executable (sampler-objects sampler-objects.c)
......
......@@ -9,7 +9,6 @@ link_libraries (
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
${TIFF_LIBRARY}
)
add_executable (arb_seamless_cubemap arb_seamless_cubemap.c)
......
......@@ -10,7 +10,6 @@ link_libraries (
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
${TIFF_LIBRARY}
)
add_executable (arb_shader_texture_lod-texgrad texgrad.c)
......
......@@ -10,7 +10,6 @@ link_libraries (
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
${TIFF_LIBRARY}
)
add_executable (ati_draw_buffers-arbfp arbfp.c)
......
......@@ -11,7 +11,6 @@ link_libraries (
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
${TIFF_LIBRARY}
)
add_executable (ati_envmap_bumpmap-bump bump.c)
......
......@@ -11,7 +11,6 @@ link_libraries (
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
${TIFF_LIBRARY}
)
add_executable (ext_fog_coord-modes modes.c)
......
......@@ -9,7 +9,6 @@ link_libraries (
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
${TIFF_LIBRARY}
)
add_executable (nv_conditional_render-bitmap bitmap.c)
......
......@@ -9,7 +9,6 @@ link_libraries (
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
${TIFF_LIBRARY}
)
add_executable (blending-in-shader blending-in-shader.c)
......
......@@ -11,7 +11,6 @@ link_libraries (
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
${TIFF_LIBRARY}
)
add_executable (array-texture array-texture.c)
......
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