diff options
| author | fronneburg <fronneburg@xevo.com> | 2018-07-05 10:12:28 -0700 |
|---|---|---|
| committer | fronneburg <fronneburg@xevo.com> | 2018-07-05 10:12:28 -0700 |
| commit | bf5c81d55c8bbb839680d0eab29d892a82330341 (patch) | |
| tree | e952d6d173599306614efd15962491c97f34d171 /src/components/functional_module/test/plugins/CMakeLists.txt | |
| parent | d4159c1768e28dccdd6027a714de59f93e06c8b2 (diff) | |
| parent | ba1da7bc2ff3fd37638620f6bea526384646ab0e (diff) | |
| download | sdl_core-bf5c81d55c8bbb839680d0eab29d892a82330341.tar.gz | |
Merge branch 'develop' of https://github.com/smartdevicelink/sdl_core into feat/mt_transport_changes
Conflicts:
src/components/application_manager/src/application_manager_impl.cc
src/components/application_manager/test/application_manager_impl_test.cc
src/components/remote_control/test/include/mock_application.h
Diffstat (limited to 'src/components/functional_module/test/plugins/CMakeLists.txt')
| -rw-r--r-- | src/components/functional_module/test/plugins/CMakeLists.txt | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/components/functional_module/test/plugins/CMakeLists.txt b/src/components/functional_module/test/plugins/CMakeLists.txt deleted file mode 100644 index 7afe8387b8..0000000000 --- a/src/components/functional_module/test/plugins/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -set(target PluginMock) - -include_directories ( - ${LOG4CXX_INCLUDE_DIRECTORY} - ${GMOCK_INCLUDE_DIRECTORY} - ${CMAKE_SOURCE_DIR}/src/components/functional_module/include/ - ${CMAKE_SOURCE_DIR}/src/components/include/ - ${JSONCPP_INCLUDE_DIRECTORY} -) - -set(SOURCES - ./mock_generic_module.cc -) - -add_library(${target} SHARED ${SOURCES}) -target_link_libraries(${target}) -add_dependencies(${target} MOBILE_API HMI_API) |