summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChad Versace <chad.versace@linux.intel.com>2012-05-18 15:38:50 -0700
committerChad Versace <chad.versace@linux.intel.com>2012-05-23 13:04:22 -0700
commitf03240c7c3857bbfac4d1a27845a5b376c771c9f (patch)
tree7ee3a38ff7bae5c378f10ebf8d8f4615626ff94d
parent8663c199421249e34b332b4ec427a9c2b0151cce (diff)
cmake: Clean up gles{1,2}/CMakeLists.txt
Now that there are options to control building the GLES1 and GLES2 tests, there is no need for the 'if' guard in these CMakeLists. Remove the unneeded 'if' guards, and hence a level of indentation. Reviewed-by: Pauli Nieminen <pauli.nieminen@intel.com> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com> Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
-rw-r--r--cmake/target_api/gles1/CMakeLists.txt16
-rw-r--r--cmake/target_api/gles2/CMakeLists.txt16
2 files changed, 14 insertions, 18 deletions
diff --git a/cmake/target_api/gles1/CMakeLists.txt b/cmake/target_api/gles1/CMakeLists.txt
index ed50d1c70..bbd7fa863 100644
--- a/cmake/target_api/gles1/CMakeLists.txt
+++ b/cmake/target_api/gles1/CMakeLists.txt
@@ -1,11 +1,9 @@
set(piglit_target_api "gles1")
-if(OPENGL_gles1_LIBRARY AND OPENGL_egl_LIBRARY)
- add_definitions(
- -DUSE_OPENGL_ES1
- -DUSE_EGLUT
- )
- add_subdirectory(${piglit_SOURCE_DIR}/tests
- ${piglit_BINARY_DIR}/target_api/${piglit_target_api}/tests
- )
-endif(OPENGL_gles1_LIBRARY AND OPENGL_egl_LIBRARY)
+add_definitions(
+ -DUSE_OPENGL_ES1
+ -DUSE_EGLUT
+ )
+add_subdirectory(${piglit_SOURCE_DIR}/tests
+ ${piglit_BINARY_DIR}/target_api/${piglit_target_api}/tests
+ )
diff --git a/cmake/target_api/gles2/CMakeLists.txt b/cmake/target_api/gles2/CMakeLists.txt
index 091dcf239..378e074a1 100644
--- a/cmake/target_api/gles2/CMakeLists.txt
+++ b/cmake/target_api/gles2/CMakeLists.txt
@@ -1,11 +1,9 @@
set(piglit_target_api "gles2")
-if(OPENGL_gles2_LIBRARY AND OPENGL_egl_LIBRARY)
- add_definitions(
- -DUSE_OPENGL_ES2
- -DUSE_EGLUT
- )
- add_subdirectory(${piglit_SOURCE_DIR}/tests
- ${piglit_BINARY_DIR}/target_api/${piglit_target_api}/tests
- )
-endif(OPENGL_gles2_LIBRARY AND OPENGL_egl_LIBRARY)
+add_definitions(
+ -DUSE_OPENGL_ES2
+ -DUSE_EGLUT
+ )
+add_subdirectory(${piglit_SOURCE_DIR}/tests
+ ${piglit_BINARY_DIR}/target_api/${piglit_target_api}/tests
+ )