diff options
author | Chad Versace <chad.versace@linux.intel.com> | 2012-09-22 16:33:42 +0200 |
---|---|---|
committer | Chad Versace <chad.versace@linux.intel.com> | 2012-10-09 19:08:30 -0700 |
commit | d39eca2b85d60540d6099150ca1eea9c14afef23 (patch) | |
tree | 920bf62953617fe8c3ec121e39ca9903f068e17f /tests/util/CMakeLists.gl.txt | |
parent | 074a6d54f5a7fa4c88a31f826ee517b4601b1e61 (diff) |
cmake: Prefix cmake options and feature macros with PIGLIT
Some cmake options and features macros had form USE_${feature}, others
BUILD_${category}_TESTS. This patch consistently prefixes all such options
and macros with PIGLIT.
Piglit, be a good code citizen. Namespace your variables.
This patch was created with
find . -type f | xargs sed -i \
-e 's/\(^\|[^_]\)\(USE_\(GLX\|GLUT\|WAFFLE\|OPENGL\|OPENGL_ES1\|OPENGL_ES2\)\)\($\|[^_]\)/\1PIGLIT_\2\4/g' \
-e 's/\(^\|[^_]\)\(BUILD_\(CL\|GLX\|GLES1\|GLES2\)_TESTS\)\($\|[^_]\)/\1PIGLIT_\2\4/g' \
Reviewed-and-tested-by: Jordan Justen <jordan.l.justen@intel.com>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Tested-by: Paul Berry <stereotype441@gmail.com>
Acked-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
Diffstat (limited to 'tests/util/CMakeLists.gl.txt')
-rw-r--r-- | tests/util/CMakeLists.gl.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/util/CMakeLists.gl.txt b/tests/util/CMakeLists.gl.txt index 2cd4ecdb9..a4e7dc682 100644 --- a/tests/util/CMakeLists.gl.txt +++ b/tests/util/CMakeLists.gl.txt @@ -18,14 +18,14 @@ link_libraries( ${UTIL_GL_LIBS} ) -IF(BUILD_GLX_TESTS) +IF(PIGLIT_BUILD_GLX_TESTS) # XXX: This is currently duplicated wherever tests # include "piglit-glx-util.h". Is it possible to refactor it? include_directories( ${GLPROTO_INCLUDE_DIRS} ) - add_definitions ( -DUSE_GLX ) + add_definitions ( -DPIGLIT_USE_GLX ) piglit_add_library (piglitglxutil piglit-shader.c piglit-shader-gl.c @@ -44,7 +44,7 @@ IF(BUILD_GLX_TESTS) ${UTIL_GL_SOURCES} piglit-glx-util.c ) -ENDIF(BUILD_GLX_TESTS) +ENDIF(PIGLIT_BUILD_GLX_TESTS) piglit_add_library (piglitutil_${piglit_target_api} ${UTIL_GL_SOURCES} |