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 /CMakeLists.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 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b2be79e2..b30f483e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,37 +17,37 @@ find_package(PNG REQUIRED) find_package(X11) -option(BUILD_GLES1_TESTS "Build tests for OpenGL ES1" OFF) -option(BUILD_GLES2_TESTS "Build tests for OpenGL ES2" OFF) -option(BUILD_CL_TESTS "Build tests for OpenCL" OFF) +option(PIGLIT_BUILD_GLES1_TESTS "Build tests for OpenGL ES1" OFF) +option(PIGLIT_BUILD_GLES2_TESTS "Build tests for OpenGL ES2" OFF) +option(PIGLIT_BUILD_CL_TESTS "Build tests for OpenCL" OFF) -option(USE_WAFFLE "Use Waffle in place of GLUT" OFF) -if(USE_WAFFLE) +option(PIGLIT_USE_WAFFLE "Use Waffle in place of GLUT" OFF) +if(PIGLIT_USE_WAFFLE) pkg_check_modules(WAFFLE REQUIRED waffle-1>=1.0.1) - add_definitions(-DUSE_WAFFLE) + add_definitions(-DPIGLIT_USE_WAFFLE) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WAFFLE_CFLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WAFFLE_CFLAGS}") -endif(USE_WAFFLE) +endif(PIGLIT_USE_WAFFLE) -if(BUILD_GLES1_TESTS AND NOT USE_WAFFLE) - message(FATAL_ERROR "Option BUILD_GLES1_TESTS requires USE_WAFFLE") -endif(BUILD_GLES1_TESTS AND NOT USE_WAFFLE) +if(PIGLIT_BUILD_GLES1_TESTS AND NOT PIGLIT_USE_WAFFLE) + message(FATAL_ERROR "Option PIGLIT_BUILD_GLES1_TESTS requires PIGLIT_USE_WAFFLE") +endif(PIGLIT_BUILD_GLES1_TESTS AND NOT PIGLIT_USE_WAFFLE) -if(BUILD_GLES2_TESTS AND NOT USE_WAFFLE) - message(FATAL_ERROR "Option BUILD_GLES2_TESTS requires USE_WAFFLE") -endif(BUILD_GLES2_TESTS AND NOT USE_WAFFLE) +if(PIGLIT_BUILD_GLES2_TESTS AND NOT PIGLIT_USE_WAFFLE) + message(FATAL_ERROR "Option PIGLIT_BUILD_GLES2_TESTS requires PIGLIT_USE_WAFFLE") +endif(PIGLIT_BUILD_GLES2_TESTS AND NOT PIGLIT_USE_WAFFLE) -if(BUILD_CL_TESTS) +if(PIGLIT_BUILD_CL_TESTS) find_package(OpenCL REQUIRED) -endif(BUILD_CL_TESTS) +endif(PIGLIT_BUILD_CL_TESTS) IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") add_definitions(-DPIGLIT_HAS_X11) - option(BUILD_GLX_TESTS "Build tests that require GLX" ON) + option(PIGLIT_BUILD_GLX_TESTS "Build tests that require GLX" ON) ELSE() - option(BUILD_GLX_TESTS "Build tests that require GLX" OFF) + option(PIGLIT_BUILD_GLX_TESTS "Build tests that require GLX" OFF) ENDIF() -IF(BUILD_GLX_TESTS) +IF(PIGLIT_BUILD_GLX_TESTS) pkg_check_modules(GLPROTO REQUIRED glproto) ENDIF() |