The vast majority of lines are indented with tabs, convert the stragglers so they don't stand out.
Also, move the final closing ')' of link_libraries to align with the command, not the arguments. Signed-off-by: Daniel Kurtz <[email protected]> --- CMakeLists.txt | 24 +++++++-------- tests/cl/CMakeLists.txt | 34 +++++++++++----------- tests/egl/CMakeLists.gl.txt | 2 +- tests/egl/spec/egl-1.4/CMakeLists.gles2.txt | 4 +-- tests/glx/CMakeLists.gl.txt | 6 ++-- tests/spec/arb_timer_query/CMakeLists.gl.txt | 2 +- .../ext_framebuffer_multisample/CMakeLists.gl.txt | 2 +- tests/spec/ext_timer_query/CMakeLists.gl.txt | 4 +-- .../spec/glx_arb_create_context/CMakeLists.gl.txt | 6 ++-- .../spec/glx_ext_import_context/CMakeLists.gl.txt | 6 ++-- .../spec/glx_mesa_query_renderer/CMakeLists.gl.txt | 6 ++-- tests/spec/glx_oml_sync_control/CMakeLists.gl.txt | 6 ++-- .../CMakeLists.gles1.txt | 6 ++-- .../CMakeLists.gles2.txt | 6 ++-- .../CMakeLists.gles1.txt | 6 ++-- tests/texturing/CMakeLists.gl.txt | 10 +++---- tests/util/CMakeLists.txt | 6 ++-- 17 files changed, 68 insertions(+), 68 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1befffb..b9bd393 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,7 +40,7 @@ if(PIGLIT_USE_WAFFLE) "packaged for your distribution, you can get it at " "http://people.freedesktop.org/~chadversary/waffle."; ) - endif() + endif() # Check the installed waffle version. # @@ -54,7 +54,7 @@ if(PIGLIT_USE_WAFFLE) if(WAFFLE_VERSION VERSION_LESS WAFFLE_REQUIRED_VERSION) message(FATAL_ERROR "Found waffle-${WAFFLE_VERSION}, but " "piglit requires waffle-${WAFFLE_REQUIRED_VERSION}") - endif() + endif() add_definitions(-DPIGLIT_USE_WAFFLE) add_definitions(-DWAFFLE_API_VERSION=0x0103) @@ -96,14 +96,14 @@ if(PIGLIT_BUILD_CL_TESTS) endif(PIGLIT_BUILD_CL_TESTS) IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") - set(PIGLIT_HAS_GBM True) - add_definitions(-DPIGLIT_HAS_GBM) + set(PIGLIT_HAS_GBM True) + add_definitions(-DPIGLIT_HAS_GBM) set(PIGLIT_HAS_X11 True) add_definitions(-DPIGLIT_HAS_X11) - set(PIGLIT_HAS_GLX True) - add_definitions(-DPIGLIT_HAS_GLX) + set(PIGLIT_HAS_GLX True) + add_definitions(-DPIGLIT_HAS_GLX) pkg_check_modules(LIBDRM QUIET libdrm) pkg_check_modules(LIBDRM_INTEL QUIET libdrm_intel) @@ -258,8 +258,8 @@ if (WIN32) # MSVC & MinGW only define & use APIENTRY add_definitions (-DGLAPIENTRY=__stdcall) - # Avoid namespace pollution when including windows.h - # http://support.microsoft.com/kb/166474 + # Avoid namespace pollution when including windows.h + # http://support.microsoft.com/kb/166474 add_definitions (-DWIN32_LEAN_AND_MEAN=1) # Don't define min/max macros @@ -285,7 +285,7 @@ endif (APPLE) FIND_LIBRARY(HAVE_LIBRT NAMES rt) if(HAVE_LIBRT) - set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} rt) + set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} rt) endif() check_c_source_compiles( " @@ -298,7 +298,7 @@ check_c_source_compiles( set(CMAKE_REQUIRED_LIBRARIES) if(PIGLIT_HAS_POSIX_CLOCK_MONOTONIC) - add_definitions(-DPIGLIT_HAS_POSIX_CLOCK_MONOTONIC) + add_definitions(-DPIGLIT_HAS_POSIX_CLOCK_MONOTONIC) endif() if(PIGLIT_USE_WAFFLE AND ${CMAKE_SYSTEM_NAME} STREQUAL "Linux") @@ -396,8 +396,8 @@ install ( ) install ( - DIRECTORY templates - DESTINATION . + DIRECTORY templates + DESTINATION . ) install ( diff --git a/tests/cl/CMakeLists.txt b/tests/cl/CMakeLists.txt index 53409ad..1b1ffc2 100644 --- a/tests/cl/CMakeLists.txt +++ b/tests/cl/CMakeLists.txt @@ -9,40 +9,40 @@ link_libraries ( ) if(PIGLIT_HAS_POSIX_CLOCK_MONOTONIC) - link_libraries(rt) + link_libraries(rt) endif() function(piglit_cl_add_test) - add_executable(${ARGV}) + add_executable(${ARGV}) endfunction(piglit_cl_add_test) function(piglit_cl_add_custom_test name) - list(REMOVE_AT ARGV 0) - piglit_cl_add_test( - cl-custom-${name} - ${ARGV} - ) + list(REMOVE_AT ARGV 0) + piglit_cl_add_test( + cl-custom-${name} + ${ARGV} + ) endfunction(piglit_cl_add_custom_test) function(piglit_cl_add_api_test name) - list(REMOVE_AT ARGV 0) - piglit_cl_add_test( - cl-api-${name} - ${ARGV} - ) + list(REMOVE_AT ARGV 0) + piglit_cl_add_test( + cl-api-${name} + ${ARGV} + ) endfunction(piglit_cl_add_api_test) function(piglit_cl_add_program_test name) - list(REMOVE_AT ARGV 0) - piglit_cl_add_test( - cl-program-${name} - ${ARGV} - ) + list(REMOVE_AT ARGV 0) + piglit_cl_add_test( + cl-program-${name} + ${ARGV} + ) endfunction(piglit_cl_add_program_test) diff --git a/tests/egl/CMakeLists.gl.txt b/tests/egl/CMakeLists.gl.txt index f3af96a..d7f17f6 100644 --- a/tests/egl/CMakeLists.gl.txt +++ b/tests/egl/CMakeLists.gl.txt @@ -6,7 +6,7 @@ include_directories( link_libraries ( piglitutil_${piglit_target_api} - ${EGL_LDFLAGS} + ${EGL_LDFLAGS} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) diff --git a/tests/egl/spec/egl-1.4/CMakeLists.gles2.txt b/tests/egl/spec/egl-1.4/CMakeLists.gles2.txt index a6985eb..2781fb2 100644 --- a/tests/egl/spec/egl-1.4/CMakeLists.gles2.txt +++ b/tests/egl/spec/egl-1.4/CMakeLists.gles2.txt @@ -1,7 +1,7 @@ link_libraries( piglitutil_${piglit_target_api} - ${EGL_LDFLAGS} - ) + ${EGL_LDFLAGS} +) piglit_add_executable(egl-terminate-then-unbind-context egl-terminate-then-unbind-context.c) diff --git a/tests/glx/CMakeLists.gl.txt b/tests/glx/CMakeLists.gl.txt index 03fee75..7f3a713 100644 --- a/tests/glx/CMakeLists.gl.txt +++ b/tests/glx/CMakeLists.gl.txt @@ -5,9 +5,9 @@ include_directories( ) if(PIGLIT_BUILD_GLX_TESTS) - link_libraries ( - piglitglxutil - ) + link_libraries ( + piglitglxutil + ) endif(PIGLIT_BUILD_GLX_TESTS) link_libraries ( diff --git a/tests/spec/arb_timer_query/CMakeLists.gl.txt b/tests/spec/arb_timer_query/CMakeLists.gl.txt index 8a4c6b9..ce46080 100644 --- a/tests/spec/arb_timer_query/CMakeLists.gl.txt +++ b/tests/spec/arb_timer_query/CMakeLists.gl.txt @@ -10,5 +10,5 @@ link_libraries ( ) IF (UNIX) - piglit_add_executable (arb_timer_query-timestamp-get timestamp-get.c) + piglit_add_executable (arb_timer_query-timestamp-get timestamp-get.c) ENDIF (UNIX) diff --git a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt index 464107c..a50f7e3 100644 --- a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt +++ b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt @@ -11,7 +11,7 @@ link_libraries ( piglit_add_executable (ext_framebuffer_multisample-accuracy common.cpp accuracy.cpp) piglit_add_executable (ext_framebuffer_multisample-alpha-to-coverage-no-draw-buffer-zero common.cpp - draw-buffers-common.cpp alpha-to-coverage-no-draw-buffer-zero.cpp) + draw-buffers-common.cpp alpha-to-coverage-no-draw-buffer-zero.cpp) piglit_add_executable (ext_framebuffer_multisample-alpha-to-coverage-dual-src-blend common.cpp draw-buffers-common.cpp alpha-to-coverage-dual-src-blend.cpp) piglit_add_executable (ext_framebuffer_multisample-alpha-to-one-dual-src-blend common.cpp diff --git a/tests/spec/ext_timer_query/CMakeLists.gl.txt b/tests/spec/ext_timer_query/CMakeLists.gl.txt index f7019ad..4d345c5 100644 --- a/tests/spec/ext_timer_query/CMakeLists.gl.txt +++ b/tests/spec/ext_timer_query/CMakeLists.gl.txt @@ -10,7 +10,7 @@ link_libraries ( ) IF (UNIX) - piglit_add_executable (ext_timer_query-time-elapsed time-elapsed.c) + piglit_add_executable (ext_timer_query-time-elapsed time-elapsed.c) ENDIF (UNIX) - piglit_add_executable (ext_timer_query-lifetime lifetime.c) +piglit_add_executable (ext_timer_query-lifetime lifetime.c) diff --git a/tests/spec/glx_arb_create_context/CMakeLists.gl.txt b/tests/spec/glx_arb_create_context/CMakeLists.gl.txt index e913d78..475b0ac 100644 --- a/tests/spec/glx_arb_create_context/CMakeLists.gl.txt +++ b/tests/spec/glx_arb_create_context/CMakeLists.gl.txt @@ -5,9 +5,9 @@ include_directories( ) if(PIGLIT_BUILD_GLX_TESTS) - link_libraries ( - piglitglxutil - ) + link_libraries ( + piglitglxutil + ) endif(PIGLIT_BUILD_GLX_TESTS) link_libraries ( diff --git a/tests/spec/glx_ext_import_context/CMakeLists.gl.txt b/tests/spec/glx_ext_import_context/CMakeLists.gl.txt index af93a16..62e4ccb 100644 --- a/tests/spec/glx_ext_import_context/CMakeLists.gl.txt +++ b/tests/spec/glx_ext_import_context/CMakeLists.gl.txt @@ -5,9 +5,9 @@ include_directories( ) if(PIGLIT_BUILD_GLX_TESTS) - link_libraries ( - piglitglxutil - ) + link_libraries ( + piglitglxutil + ) endif(PIGLIT_BUILD_GLX_TESTS) link_libraries ( diff --git a/tests/spec/glx_mesa_query_renderer/CMakeLists.gl.txt b/tests/spec/glx_mesa_query_renderer/CMakeLists.gl.txt index f51ceff..399303c 100644 --- a/tests/spec/glx_mesa_query_renderer/CMakeLists.gl.txt +++ b/tests/spec/glx_mesa_query_renderer/CMakeLists.gl.txt @@ -5,9 +5,9 @@ include_directories( ) if(PIGLIT_BUILD_GLX_TESTS) - link_libraries ( - piglitglxutil - ) + link_libraries ( + piglitglxutil + ) endif(PIGLIT_BUILD_GLX_TESTS) link_libraries ( diff --git a/tests/spec/glx_oml_sync_control/CMakeLists.gl.txt b/tests/spec/glx_oml_sync_control/CMakeLists.gl.txt index d73365d..4859629 100644 --- a/tests/spec/glx_oml_sync_control/CMakeLists.gl.txt +++ b/tests/spec/glx_oml_sync_control/CMakeLists.gl.txt @@ -5,9 +5,9 @@ include_directories( ) if(PIGLIT_BUILD_GLX_TESTS) - link_libraries ( - piglitglxutil - ) + link_libraries ( + piglitglxutil + ) endif(PIGLIT_BUILD_GLX_TESTS) link_libraries ( diff --git a/tests/spec/oes_compressed_etc1_rgb8_texture/CMakeLists.gles1.txt b/tests/spec/oes_compressed_etc1_rgb8_texture/CMakeLists.gles1.txt index ce0511b..e26e037 100644 --- a/tests/spec/oes_compressed_etc1_rgb8_texture/CMakeLists.gles1.txt +++ b/tests/spec/oes_compressed_etc1_rgb8_texture/CMakeLists.gles1.txt @@ -4,8 +4,8 @@ include_directories( ) link_libraries( - piglitutil_${piglit_target_api} - ${OPENGL_gles1_LIBRARY} - ) + piglitutil_${piglit_target_api} + ${OPENGL_gles1_LIBRARY} +) piglit_add_executable (oes_compressed_etc1_rgb8_texture-basic oes_compressed_etc1_rgb8_texture-basic.c) diff --git a/tests/spec/oes_compressed_etc1_rgb8_texture/CMakeLists.gles2.txt b/tests/spec/oes_compressed_etc1_rgb8_texture/CMakeLists.gles2.txt index 7108378..894bd58 100644 --- a/tests/spec/oes_compressed_etc1_rgb8_texture/CMakeLists.gles2.txt +++ b/tests/spec/oes_compressed_etc1_rgb8_texture/CMakeLists.gles2.txt @@ -4,8 +4,8 @@ include_directories( ) link_libraries( - piglitutil_${piglit_target_api} - ${OPENGL_gles2_LIBRARY} - ) + piglitutil_${piglit_target_api} + ${OPENGL_gles2_LIBRARY} +) piglit_add_executable(oes_compressed_etc1_rgb8_texture-miptree oes_compressed_etc1_rgb8_texture-miptree.c) diff --git a/tests/spec/oes_compressed_paletted_texture/CMakeLists.gles1.txt b/tests/spec/oes_compressed_paletted_texture/CMakeLists.gles1.txt index f615b12..2866a36 100644 --- a/tests/spec/oes_compressed_paletted_texture/CMakeLists.gles1.txt +++ b/tests/spec/oes_compressed_paletted_texture/CMakeLists.gles1.txt @@ -4,8 +4,8 @@ include_directories( ) link_libraries( - piglitutil_${piglit_target_api} - ${OPENGL_gles1_LIBRARY} - ) + piglitutil_${piglit_target_api} + ${OPENGL_gles1_LIBRARY} +) piglit_add_executable (oes_compressed_paletted_texture-api oes_compressed_paletted_texture-api.c) diff --git a/tests/texturing/CMakeLists.gl.txt b/tests/texturing/CMakeLists.gl.txt index cf8e3c5..29d12c3 100644 --- a/tests/texturing/CMakeLists.gl.txt +++ b/tests/texturing/CMakeLists.gl.txt @@ -50,10 +50,10 @@ piglit_add_executable (rg-teximage-02 rg-teximage-02.c rg-teximage-common.c) piglit_add_executable (rgtc-teximage-01 rgtc-teximage-01.c rg-teximage-common.c) piglit_add_executable (rgtc-teximage-02 rgtc-teximage-02.c rg-teximage-common.c) IF (UNIX) - target_link_libraries (rg-teximage-01 m) - target_link_libraries (rg-teximage-02 m) - target_link_libraries (rgtc-teximage-01 m) - target_link_libraries (rgtc-teximage-02 m) + target_link_libraries (rg-teximage-01 m) + target_link_libraries (rg-teximage-02 m) + target_link_libraries (rgtc-teximage-01 m) + target_link_libraries (rgtc-teximage-02 m) ENDIF (UNIX) piglit_add_executable (s3tc-teximage s3tc-teximage.c) piglit_add_executable (fxt1-teximage fxt1-teximage.c) @@ -83,7 +83,7 @@ piglit_add_executable (tex-skipped-unit tex-skipped-unit.c) piglit_add_executable (tex-swizzle tex-swizzle.c) piglit_add_executable (tex-srgb tex-srgb.c) IF (UNIX) - target_link_libraries (tex-srgb m) + target_link_libraries (tex-srgb m) ENDIF (UNIX) piglit_add_executable (texsubimage texsubimage.c) piglit_add_executable (texture-al texture-al.c) diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt index 6745a2f..d4192fc 100644 --- a/tests/util/CMakeLists.txt +++ b/tests/util/CMakeLists.txt @@ -1,7 +1,7 @@ add_definitions(-DSOURCE_DIR="${piglit_SOURCE_DIR}/") if(PIGLIT_HAS_POSIX_CLOCK_MONOTONIC AND HAVE_LIBRT) - link_libraries(rt) + link_libraries(rt) endif() set(UTIL_INCLUDES @@ -24,7 +24,7 @@ set(UTIL_GL_SOURCES piglit-util-gl-common.c piglit-framework-gl/piglit_gl_framework.c piglit-framework-gl.c - piglit_ktx.c + piglit_ktx.c rgb9e5.c ) @@ -51,7 +51,7 @@ endif() set(UTIL_GL_LIBS piglitutil - ${WAFFLE_LDFLAGS} + ${WAFFLE_LDFLAGS} ) if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") -- 1.8.5.2 _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
