Merge vk-gl-cts/vulkan-cts-1.0.1 into vk-gl-cts/vulkan-cts-1.0.2

[platform/upstream/VK-GL-CTS.git] / targets / wayland / wayland.cmake

diff --git a/targets/wayland/wayland.cmake b/targets/wayland/wayland.cmake
index e322603..8adc417 100644 (file)
--- a/targets/wayland/wayland.cmake
+++ b/targets/wayland/wayland.cmake
@@ -1,15 +1,31 @@
+#-------------------------------------------------------------------------
+# drawElements CMake utilities
+# ----------------------------
+#
+# Copyright (c) 2016 The Khronos Group Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#-------------------------------------------------------------------------
+
 message("*** Using Wayland target")
-set(DEQP_TARGET_NAME   "WAYLAND")
-set(DEQP_RUNTIME_LINK  ON)
-set(DEQP_SUPPORT_GLES2 ON)
-set(DEQP_SUPPORT_GLES3 ON)
-set(DEQP_SUPPORT_EGL   ON)
+set(DEQP_TARGET_NAME "Wayland")
 
 # Use Wayland target
 set(DEQP_USE_WAYLAND   ON)
 
 # Add FindWayland module
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/targets/wayland")
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/targets/default")
 
 find_package(Wayland)
 if (NOT WAYLAND_FOUND)
@@ -17,14 +33,4 @@ if (NOT WAYLAND_FOUND)
 endif ()
 
 set(DEQP_PLATFORM_LIBRARIES ${WAYLAND_LIBRARIES})
-include_directories(${WAYLAND_INCLUDE_DIR})
-
-# Platform sources
-set(TCUTIL_PLATFORM_SRCS
-       wayland/tcuWayland.cpp
-       wayland/tcuWayland.hpp
-       wayland/tcuWaylandPlatform.cpp
-       wayland/tcuWaylandPlatform.hpp
-       wayland/tcuWaylandEglPlatform.cpp
-       wayland/tcuWaylandEglPlatform.hpp
-       )
+include_directories(${WAYLAND_INCLUDE_DIR})
\ No newline at end of file