[Piglit] [PATCH 02/18] cmake: Clean up gles{1,2}/CMakeLists.txt

Chad Versace chad.versace at linux.intel.com
Tue May 22 18:01:42 PDT 2012


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: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
---
 cmake/target_api/gles1/CMakeLists.txt |   16 +++++++---------
 cmake/target_api/gles2/CMakeLists.txt |   16 +++++++---------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/cmake/target_api/gles1/CMakeLists.txt b/cmake/target_api/gles1/CMakeLists.txt
index ed50d1c..bbd7fa8 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 091dcf2..378e074 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
+	)
-- 
1.7.10.1



More information about the Piglit mailing list