diff options
| author | Kozoriz <kozorizandriy@gmail.com> | 2016-05-21 15:59:35 +0300 |
|---|---|---|
| committer | Kozoriz <kozorizandriy@gmail.com> | 2016-05-30 13:38:01 +0300 |
| commit | 34008fed84d79dc9ca8274b271071a0165d37812 (patch) | |
| tree | 74e548749070c6881002a12e1a33e18b5dbf4af6 /src/components/application_manager/test | |
| parent | 42290f21e660ba1f68fe51d0ab69da5db9fb4802 (diff) | |
| download | sdl_core-34008fed84d79dc9ca8274b271071a0165d37812.tar.gz | |
Update CMakeLists according rules
Diffstat (limited to 'src/components/application_manager/test')
3 files changed, 4 insertions, 9 deletions
diff --git a/src/components/application_manager/test/CMakeLists.txt b/src/components/application_manager/test/CMakeLists.txt index 118cda4fcb..e16170be0b 100644 --- a/src/components/application_manager/test/CMakeLists.txt +++ b/src/components/application_manager/test/CMakeLists.txt @@ -152,7 +152,7 @@ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libPolicy.so set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath=${CMAKE_CURRENT_BINARY_DIR}") create_test("application_manager_test" "${testSources}" "${testLibraries}" ) -# TODO [AKozoriz] : Fix not buildable tests + set(ResumptionData_SOURCES ${AM_TEST_DIR}/resumption/resumption_data_test.cc ${AM_TEST_DIR}/resumption/resumption_data_db_test.cc diff --git a/src/components/application_manager/test/message_helper/CMakeLists.txt b/src/components/application_manager/test/message_helper/CMakeLists.txt index bfc0228bbb..d115ad8b40 100755 --- a/src/components/application_manager/test/message_helper/CMakeLists.txt +++ b/src/components/application_manager/test/message_helper/CMakeLists.txt @@ -30,14 +30,9 @@ if(BUILD_TESTS) -set(appMain_DIR ${CMAKE_SOURCE_DIR}/src/appMain) - include_directories( ${GMOCK_INCLUDE_DIRECTORY} - ${COMPONENTS_DIR}/application_manager/test/message_helper/include - ${COMPONENTS_DIR}/application_manager/test/state_controller/include - ${COMPONENTS_DIR}/include - ${COMPONENTS_DIR} + ${COMPONENTS_DIR}/application_manager/test/include/ ) set(LIBRARIES @@ -53,7 +48,7 @@ set(LIBRARIES ) set(SOURCES - #message_helper_test.cc + ${COMPONENTS_DIR}/application_manager/test/message_helper/message_helper_test.cc ) create_test("message_helper_test" "${SOURCES}" "${LIBRARIES}") diff --git a/src/components/application_manager/test/state_controller/CMakeLists.txt b/src/components/application_manager/test/state_controller/CMakeLists.txt index 50dd931309..22f04cb900 100644 --- a/src/components/application_manager/test/state_controller/CMakeLists.txt +++ b/src/components/application_manager/test/state_controller/CMakeLists.txt @@ -42,7 +42,7 @@ set(LIBRARIES ) set(SOURCES - state_controller_test.cc + ${COMPONENTS_DIR}/application_manager/test/state_controller/state_controller_test.cc ${COMPONENTS_DIR}/application_manager/test/mock_message_helper.cc ) |