diff options
| author | Michael Schuldt <michael.schuldt@bmw-carit.de> | 2011-08-24 08:46:23 +0200 |
|---|---|---|
| committer | Michael Schuldt <michael.schuldt@bmw-carit.de> | 2011-08-24 08:46:23 +0200 |
| commit | 90a8f8a39d91aa0ef4567a7963e7c4658b7a3259 (patch) | |
| tree | 8dc8228b79695f997a64ce915b3ca87f716e6264 /LayerManagerPlugins | |
| parent | 4260cdc723c9e9b374c4f3a72a5de695228c692b (diff) | |
| download | layer_management-90a8f8a39d91aa0ef4567a7963e7c4658b7a3259.tar.gz | |
Bugfix : Fixing link error in transformation tests
introduction of new methods in GraphicalSurface.cpp
means this class must also be added to the build of viewtransformtest.
Diffstat (limited to 'LayerManagerPlugins')
| -rw-r--r-- | LayerManagerPlugins/Renderers/Graphic/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | LayerManagerPlugins/Renderers/Graphic/tests/CMakeLists.txt | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/LayerManagerPlugins/Renderers/Graphic/CMakeLists.txt b/LayerManagerPlugins/Renderers/Graphic/CMakeLists.txt index 0a8b2c4..a938fdb 100644 --- a/LayerManagerPlugins/Renderers/Graphic/CMakeLists.txt +++ b/LayerManagerPlugins/Renderers/Graphic/CMakeLists.txt @@ -69,10 +69,6 @@ file(GLOB GRAPHIC_TRANSFORM_INCLUDES include/Transformation/ViewportTransform.h ) -if (WITH_TESTS) - add_subdirectory (tests) -endif(WITH_TESTS) - endif(WITH_GLESv2_LIB) if (WITH_GLX_LIB) @@ -119,7 +115,10 @@ file(GLOB GRAPHIC_TRANSFORM_INCLUDES endif(WITH_GLX_LIB) - +if (WITH_TESTS) + add_subdirectory (tests) +endif(WITH_TESTS) + add_library(${GRAPHIC_LIB_NAME} SHARED ${SOURCES}) find_package(X11 REQUIRED) diff --git a/LayerManagerPlugins/Renderers/Graphic/tests/CMakeLists.txt b/LayerManagerPlugins/Renderers/Graphic/tests/CMakeLists.txt index eebd3b4..4719e16 100644 --- a/LayerManagerPlugins/Renderers/Graphic/tests/CMakeLists.txt +++ b/LayerManagerPlugins/Renderers/Graphic/tests/CMakeLists.txt @@ -28,7 +28,7 @@ enable_testing() find_package (Threads) set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT} LayerManagerUtils) -file(GLOB LM_SOURCES ../../../../LayerManagerService/src/Scene.cpp ../../../../LayerManagerService/src/LogicalGraphicsObject.cpp) +file(GLOB LM_SOURCES ../../../../LayerManagerService/src/Scene.cpp ../../../../LayerManagerService/src/GraphicalSurface.cpp ../../../../LayerManagerService/src/LogicalGraphicsObject.cpp) add_executable(ViewportTransformTest ${LM_SOURCES} ../src/Transformation/ViewportTransform.cpp ViewportTransformTest.cpp gmock/gmock_main.cc gmock/gmock-gtest-all.cc) target_link_libraries(ViewportTransformTest ${LIBS}) |