From d39eca2b85d60540d6099150ca1eea9c14afef23 Mon Sep 17 00:00:00 2001 From: Chad Versace Date: Sat, 22 Sep 2012 16:33:42 +0200 Subject: 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 Acked-by: Kenneth Graunke Tested-by: Paul Berry Acked-by: Eric Anholt Signed-off-by: Chad Versace --- cmake/target_api/CMakeLists.txt | 12 ++++++------ cmake/target_api/gl/CMakeLists.txt | 10 +++++----- cmake/target_api/gles1/CMakeLists.txt | 2 +- cmake/target_api/gles2/CMakeLists.txt | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'cmake') diff --git a/cmake/target_api/CMakeLists.txt b/cmake/target_api/CMakeLists.txt index d3e23f9ff..c5e0b904f 100644 --- a/cmake/target_api/CMakeLists.txt +++ b/cmake/target_api/CMakeLists.txt @@ -25,14 +25,14 @@ add_subdirectory(no_api) add_subdirectory(gl) -if(BUILD_GLES1_TESTS) +if(PIGLIT_BUILD_GLES1_TESTS) add_subdirectory(gles1) -endif(BUILD_GLES1_TESTS) +endif(PIGLIT_BUILD_GLES1_TESTS) -if(BUILD_GLES2_TESTS) +if(PIGLIT_BUILD_GLES2_TESTS) add_subdirectory(gles2) -endif(BUILD_GLES2_TESTS) +endif(PIGLIT_BUILD_GLES2_TESTS) -if(BUILD_CL_TESTS) +if(PIGLIT_BUILD_CL_TESTS) add_subdirectory(cl) -endif(BUILD_CL_TESTS) +endif(PIGLIT_BUILD_CL_TESTS) diff --git a/cmake/target_api/gl/CMakeLists.txt b/cmake/target_api/gl/CMakeLists.txt index ae67020d3..b13229de4 100644 --- a/cmake/target_api/gl/CMakeLists.txt +++ b/cmake/target_api/gl/CMakeLists.txt @@ -1,19 +1,19 @@ set(piglit_target_api "gl") add_definitions( - -DUSE_OPENGL + -DPIGLIT_USE_OPENGL ) -if(USE_WAFFLE) +if(PIGLIT_USE_WAFFLE) link_libraries(glut_waffle) -else(USE_WAFFLE) - add_definitions(-DUSE_GLUT) +else(PIGLIT_USE_WAFFLE) + add_definitions(-DPIGLIT_USE_GLUT) include_directories( ${GLUT_INCLUDE_DIR} ) link_libraries( ${GLUT_glut_LIBRARY} ) -endif(USE_WAFFLE) +endif(PIGLIT_USE_WAFFLE) add_subdirectory(${piglit_SOURCE_DIR}/tests ${piglit_BINARY_DIR}/target_api/${piglit_target_api}/tests diff --git a/cmake/target_api/gles1/CMakeLists.txt b/cmake/target_api/gles1/CMakeLists.txt index 02ca906ad..b76d51bd6 100644 --- a/cmake/target_api/gles1/CMakeLists.txt +++ b/cmake/target_api/gles1/CMakeLists.txt @@ -1,7 +1,7 @@ set(piglit_target_api "gles1") add_definitions( - -DUSE_OPENGL_ES1 + -DPIGLIT_USE_OPENGL_ES1 ) link_libraries(glut_waffle) add_subdirectory(${piglit_SOURCE_DIR}/tests diff --git a/cmake/target_api/gles2/CMakeLists.txt b/cmake/target_api/gles2/CMakeLists.txt index 4dcfd175c..b8cad2055 100644 --- a/cmake/target_api/gles2/CMakeLists.txt +++ b/cmake/target_api/gles2/CMakeLists.txt @@ -1,7 +1,7 @@ set(piglit_target_api "gles2") add_definitions( - -DUSE_OPENGL_ES2 + -DPIGLIT_USE_OPENGL_ES2 ) link_libraries(glut_waffle) add_subdirectory(${piglit_SOURCE_DIR}/tests -- cgit v1.2.3