From 69d0da1c70fd07851793d79f96456dd9aff05199 Mon Sep 17 00:00:00 2001 From: Timo Lotterbach Date: Tue, 12 Mar 2013 05:25:23 -0700 Subject: [PATCH] Graphic: moved ViewportTransform unit test to LayerMangerBase/tests Signed-off-by: Timo Lotterbach --- CMakeLists.txt | 5 ++ LayerManagerBase/tests/CMakeLists.txt | 1 + .../tests/ViewportTransformTest.cpp | 0 .../Renderers/Graphic/CMakeLists.txt | 40 ---------------- .../Renderers/Graphic/tests/CMakeLists.txt | 56 ---------------------- 5 files changed, 6 insertions(+), 96 deletions(-) rename {LayerManagerPlugins/Renderers/Graphic => LayerManagerBase}/tests/ViewportTransformTest.cpp (100%) delete mode 100644 LayerManagerPlugins/Renderers/Graphic/CMakeLists.txt delete mode 100644 LayerManagerPlugins/Renderers/Graphic/tests/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 52e4a53..9b6d03a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -137,6 +137,7 @@ endif(WITH_DESKTOP) build_flag (WITH_GLX_LIB "Build development library for OpenGL/X11 based renderers" OFF) #=========================================================================================================== if (WITH_GLX_LIB) + add_subdirectory_once (LayerManagerPlugins/Renderers/Graphic) add_subdirectory_once (LayerManagerPlugins/Renderers/GraphicLib/LayerManagerGraphicGLX) endif(WITH_GLX_LIB) @@ -155,6 +156,7 @@ endif(WITH_WAYLAND_X11) build_flag (WITH_WAYLAND_X11_LIB "Build development library for GLES/Wayland X11 based renderers" OFF) #=========================================================================================================== if (WITH_WAYLAND_X11_LIB) + add_subdirectory_once (LayerManagerPlugins/Renderers/Graphic) add_subdirectory_once (LayerManagerPlugins/Renderers/GraphicLib/LayerManagerGraphicWaylandX11GLESv2) endif(WITH_WAYLAND_X11_LIB) @@ -173,6 +175,7 @@ endif(WITH_WAYLAND_DRM) build_flag (WITH_WAYLAND_DRM_LIB "Build development library for GLES/Wayland DRM based renderers" OFF) #=========================================================================================================== if (WITH_WAYLAND_DRM_LIB) + add_subdirectory_once (LayerManagerPlugins/Renderers/Graphic) add_subdirectory_once (LayerManagerPlugins/Renderers/GraphicLib/LayerManagerGraphicWaylandDrmGLESv2) endif(WITH_WAYLAND_DRM_LIB) @@ -191,6 +194,7 @@ endif(WITH_WAYLAND_FBDEV) build_flag (WITH_WAYLAND_FBDEV_LIB "Build development library for GLES/Wayland FBDEV based renderers" OFF) #=========================================================================================================== if (WITH_WAYLAND_FBDEV_LIB) + add_subdirectory_once (LayerManagerPlugins/Renderers/Graphic) add_subdirectory_once (LayerManagerPlugins/Renderers/GraphicLib/LayerManagerGraphicWaylandFbdevGLESv2) endif(WITH_WAYLAND_FBDEV_LIB) @@ -206,6 +210,7 @@ endif(WITH_X11_GLES) build_flag (WITH_GLESv2_LIB "Build development library for GLES/X11 based renderers" OFF) #=========================================================================================================== if (WITH_GLESv2_LIB) + add_subdirectory_once (LayerManagerPlugins/Renderers/Graphic) add_subdirectory_once (LayerManagerPlugins/Renderers/GraphicLib/LayerManagerGraphicGLESv2) endif(WITH_GLESv2_LIB) diff --git a/LayerManagerBase/tests/CMakeLists.txt b/LayerManagerBase/tests/CMakeLists.txt index 5e426ef..f6385aa 100644 --- a/LayerManagerBase/tests/CMakeLists.txt +++ b/LayerManagerBase/tests/CMakeLists.txt @@ -46,6 +46,7 @@ if (WITH_TESTS) ShaderProgramTest.cpp ShaderProgramFactoryTest.cpp RectangleTest.cpp + ViewportTransformTest.cpp ) target_link_libraries(${PROJECT_NAME} diff --git a/LayerManagerPlugins/Renderers/Graphic/tests/ViewportTransformTest.cpp b/LayerManagerBase/tests/ViewportTransformTest.cpp similarity index 100% rename from LayerManagerPlugins/Renderers/Graphic/tests/ViewportTransformTest.cpp rename to LayerManagerBase/tests/ViewportTransformTest.cpp diff --git a/LayerManagerPlugins/Renderers/Graphic/CMakeLists.txt b/LayerManagerPlugins/Renderers/Graphic/CMakeLists.txt deleted file mode 100644 index 954e232..0000000 --- a/LayerManagerPlugins/Renderers/Graphic/CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ -############################################################################ -# -# Copyright 2010-2012 BMW Car IT GmbH -# Copyright (C) 2011 DENSO CORPORATION and Robert Bosch Car Multimedia Gmbh -# -# -# 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. -# -############################################################################ - -cmake_minimum_required (VERSION 2.6) - -#=========================================================================== -# Common -#=========================================================================== - -include_directories( - include - ../Base/include - ${CMAKE_SOURCE_DIR}/config - ${CMAKE_SOURCE_DIR}/LayerManagerBase/include - ${CMAKE_SOURCE_DIR}/LayerManagerUtils/include -) - -if (WITH_TESTS) - set (CMAKE_CXX_FLAGS "") - enable_testing() - add_subdirectory (tests) -endif(WITH_TESTS) - diff --git a/LayerManagerPlugins/Renderers/Graphic/tests/CMakeLists.txt b/LayerManagerPlugins/Renderers/Graphic/tests/CMakeLists.txt deleted file mode 100644 index fc39a84..0000000 --- a/LayerManagerPlugins/Renderers/Graphic/tests/CMakeLists.txt +++ /dev/null @@ -1,56 +0,0 @@ -############################################################################ -# -# Copyright 2010, 2011 BMW Car IT GmbH -# -# -# 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. -# -############################################################################ - -cmake_minimum_required (VERSION 2.6) - -find_package (Threads) - -include_directories( - "." - "../include" - "${PROJECT_SOURCE_DIR}/LayerManagerService/include" - "${PROJECT_SOURCE_DIR}/LayerManagerUtils/include" -) - -set(LIBS - ${LIBS} - ${CMAKE_THREAD_LIBS_INIT} - LayerManagerUtils -) - -file(GLOB LM_SOURCES - ${PROJECT_SOURCE_DIR}/LayerManagerService/src/Scene.cpp - ${PROJECT_SOURCE_DIR}/LayerManagerService/src/GraphicalSurface.cpp - ${PROJECT_SOURCE_DIR}/LayerManagerService/src/GraphicalObject.cpp - ${PROJECT_SOURCE_DIR}/LayerManagerService/src/LogicalGraphicsObject.cpp -) - -enable_testing() - -add_executable(ViewportTransform_Test - ${LM_SOURCES} - ViewportTransformTest.cpp -) - -target_link_libraries(ViewportTransform_Test - ${LIBS} - gtest -) - -add_test(ViewportTransformations ViewportTransform_Test) -- 2.7.4