diff options
| author | Christian Linke <Christian.Linke@bmw.de> | 2016-03-08 06:38:33 -0800 |
|---|---|---|
| committer | Christian Linke <Christian.Linke@bmw.de> | 2016-03-09 05:24:34 -0800 |
| commit | daf851ee7a41d1b0572c0c95e15f61e427ce97f1 (patch) | |
| tree | 10b709ca4ebbeba72fd08a616a74ca00b89cfe8d /AudioManagerCore/test/AmControlInterfaceTest | |
| parent | 6c8aa325ae196c0a58a06086244e080b4b98b554 (diff) | |
| download | audiomanager-daf851ee7a41d1b0572c0c95e15f61e427ce97f1.tar.gz | |
some cleanup
Signed-off-by: Christian Linke <Christian.Linke@bmw.de>
Diffstat (limited to 'AudioManagerCore/test/AmControlInterfaceTest')
| -rw-r--r-- | AudioManagerCore/test/AmControlInterfaceTest/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | AudioManagerCore/test/AmControlInterfaceTest/CMakeLists.txt~ | 50 |
2 files changed, 3 insertions, 53 deletions
diff --git a/AudioManagerCore/test/AmControlInterfaceTest/CMakeLists.txt b/AudioManagerCore/test/AmControlInterfaceTest/CMakeLists.txt index 4f33ac5..7660bbf 100644 --- a/AudioManagerCore/test/AmControlInterfaceTest/CMakeLists.txt +++ b/AudioManagerCore/test/AmControlInterfaceTest/CMakeLists.txt @@ -33,9 +33,9 @@ INCLUDE_DIRECTORIES( add_executable(AmControlInterfaceTest ${CONTROL_INTERFACE_SRCS_CXX}) TARGET_LINK_LIBRARIES(AmControlInterfaceTest - ${GTEST_LIBRARIES} - ${GMOCK_LIBRARIES} - AudioManagerCore + ${GTEST_LIBRARIES} + ${GMOCK_LIBRARIES} + AudioManagerCore ) add_test(AmControlInterfaceTest AmControlInterfaceTest) diff --git a/AudioManagerCore/test/AmControlInterfaceTest/CMakeLists.txt~ b/AudioManagerCore/test/AmControlInterfaceTest/CMakeLists.txt~ deleted file mode 100644 index 5b71a59..0000000 --- a/AudioManagerCore/test/AmControlInterfaceTest/CMakeLists.txt~ +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright (C) 2012, BMW AG -# -# This file is part of GENIVI Project AudioManager. -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# -# copyright -# This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. if a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# author Christian Linke, christian.linke@bmw.de BMW 2011,2012 -# -# For further information see http://www.genivi.org/. -# - -cmake_minimum_required(VERSION 3.0) - -project(AmControlInterfaceTest LANGUAGES CXX VERSION ${DAEMONVERSION}) - -INCLUDE_DIRECTORIES( - ${AUDIOMANAGER_CORE_INCLUDE} - ${GMOCK_INCLUDE_DIRS} - ${GTEST_INCLUDE_DIRS}) - - - file(GLOB CONTROL_INTERFACE_SRCS_CXX - "../CAmCommonFunctions.cpp" - "*.cpp" -) - -add_executable(AmControlInterfaceTest ${CONTROL_INTERFACE_SRCS_CXX}) - -TARGET_LINK_LIBRARIES(AmControlInterfaceTest - ${GTEST_LIBRARIES} - ${GMOCK_LIBRARIES} - AudioManagerCore -) - -ADD_DEPENDENCIES(AmControlInterfaceTest AudioManagerCore) - -INSTALL(TARGETS AmControlInterfaceTest - DESTINATION ${TEST_EXECUTABLE_INSTALL_PATH} - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ - COMPONENT tests) - - - - |