LayerManagerUtils: fixed unit test build to use unit test configuration

Signed-off-by: Timo Lotterbach <timo.lotterbach@bmw-carit.de>

diff --git a/LayerManagerUtils/CMakeLists.txt b/LayerManagerUtils/CMakeLists.txt
index e3c8b14..2a4cc53 100644 (file)
--- a/LayerManagerUtils/CMakeLists.txt
+++ b/LayerManagerUtils/CMakeLists.txt
@@ -79,22 +79,5 @@ install(TARGETS
             lib/layermanager/static
 )
 
-if (WITH_TESTS)
+add_subdirectory(tests)
 
-    add_executable(${PROJECT_NAME}_Test
-        tests/BitmapTest.cpp
-        tests/LogTest.cpp
-    )
-
-    target_link_libraries(${PROJECT_NAME}_Test
-        LayerManagerUtils
-        gtest
-        pthread
-        ${LIBS}
-        ${DLT_LIBRARY}
-    )
-
-    enable_testing()
-    add_test(${PROJECT_NAME} ${PROJECT_NAME}_Test)
-
-endif(WITH_TESTS) 

diff --git a/LayerManagerUtils/tests/CMakeLists.txt b/LayerManagerUtils/tests/CMakeLists.txt
new file mode 100644 (file)
index 0000000..b406d4f
--- /dev/null
+++ b/LayerManagerUtils/tests/CMakeLists.txt
@@ -0,0 +1,52 @@
+############################################################################
+# 
+# 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)
+
+if (WITH_TESTS)
+
+    enable_testing()
+
+    project(LayerManagerUtils_Test)
+    project_type(TEST)
+
+    set(LIBS
+        ${LIBS}
+        ${CMAKE_THREAD_LIBS_INIT}
+        LayerManagerUtils
+        dl
+        gtest
+    )
+
+    include_directories(${INCLUDE_DIRS})
+
+    add_executable(${PROJECT_NAME}
+        BitmapTest.cpp
+        LogTest.cpp
+    )
+
+    target_link_libraries(${PROJECT_NAME} ${LIBS})
+
+    install(TARGETS     ${PROJECT_NAME}
+            DESTINATION bin
+    )
+
+    add_test(LayerManagerUtils ${PROJECT_NAME})
+
+endif(WITH_TESTS)