Get rid of indirection when adding module directories in build

The machinery was needed in the past when some of the test module
directories could have been missing when building the source.

Change-Id: Ibf96483f70b1ae19a672c91603243dd06d286f08

diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index 42b806165866a68a25e9fdfa63984ab25e22be5e..3650793c0f61efb4e7765688807d31e6174066ec 100644 (file)
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -1,12 +1,12 @@
 # dEQP Modules
-include(glshared/glshared.cmake                        OPTIONAL)
-include(gles2/gles2.cmake                              OPTIONAL)
-include(gles3/gles3.cmake                              OPTIONAL)
-include(gles31/gles31.cmake                            OPTIONAL)
-include(egl/egl.cmake                                  OPTIONAL)
+add_subdirectory(glshared)
+add_subdirectory(gles2)
+add_subdirectory(gles3)
+add_subdirectory(gles31)
+add_subdirectory(egl)
 
 # Misc
-include(internal/internal.cmake                        OPTIONAL)
+add_subdirectory(internal)
 
 # Pass DEQP_MODULE_LIBRARIES and DEQP_MODULE_ENTRY_POINTS
 set(DEQP_MODULE_LIBRARIES ${DEQP_MODULE_LIBRARIES} PARENT_SCOPE)

diff --git a/modules/egl/egl.cmake b/modules/egl/egl.cmake
deleted file mode 100644 (file)
index ed6c386..0000000
--- a/modules/egl/egl.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-if (DEQP_SUPPORT_EGL)
-       add_subdirectory(egl)
-endif ()
-

diff --git a/modules/gles2/gles2.cmake b/modules/gles2/gles2.cmake
deleted file mode 100644 (file)
index 99c9ac4..0000000
--- a/modules/gles2/gles2.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-if (DEQP_SUPPORT_GLES2)
-       add_subdirectory(gles2)
-endif ()

diff --git a/modules/gles3/gles3.cmake b/modules/gles3/gles3.cmake
deleted file mode 100644 (file)
index f69339d..0000000
--- a/modules/gles3/gles3.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-if (DEQP_SUPPORT_GLES3)
-       add_subdirectory(gles3)
-endif ()

diff --git a/modules/gles31/gles31.cmake b/modules/gles31/gles31.cmake
deleted file mode 100644 (file)
index 7d54ff8..0000000
--- a/modules/gles31/gles31.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-if (DEQP_SUPPORT_GLES3)
-       add_subdirectory(gles31)
-endif ()

diff --git a/modules/glshared/glshared.cmake b/modules/glshared/glshared.cmake
deleted file mode 100644 (file)
index 783f37d..0000000
--- a/modules/glshared/glshared.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-if (DEQP_SUPPORT_GLES2 OR DEQP_SUPPORT_GLES3 OR DEQP_SUPPORT_OPENGL)
-       add_subdirectory(glshared)
-endif ()

diff --git a/modules/internal/internal.cmake b/modules/internal/internal.cmake
deleted file mode 100644 (file)
index 105d974..0000000
--- a/modules/internal/internal.cmake
+++ /dev/null
@@ -1 +0,0 @@
-add_subdirectory(internal)