diff options
| author | Alexander Kutsan (GitHub) <akutsan@luxoft.com> | 2017-01-05 15:18:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-05 15:18:10 +0200 |
| commit | c0201b2eb983eb963f53fc23266c0e5cfae9f708 (patch) | |
| tree | 8b451b5772dd5d3aed43739ef47fb34b857a7628 /src/components/config_profile | |
| parent | 15fc6572395056b43cd6fbf23737048772daa350 (diff) | |
| download | sdl_core-c0201b2eb983eb963f53fc23266c0e5cfae9f708.tar.gz | |
Revert "Fix/cmake files refactoring"revert-1144-fix/cmake_files_refactoring
Diffstat (limited to 'src/components/config_profile')
| -rw-r--r-- | src/components/config_profile/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | src/components/config_profile/test/CMakeLists.txt | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/src/components/config_profile/CMakeLists.txt b/src/components/config_profile/CMakeLists.txt index 2f8561fc2d..107fd58127 100644 --- a/src/components/config_profile/CMakeLists.txt +++ b/src/components/config_profile/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2016, Ford Motor Company +# Copyright (c) 2014, Ford Motor Company # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -28,7 +28,6 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/sources.cmake) include_directories ( include @@ -36,18 +35,13 @@ include_directories ( ${LOG4CXX_INCLUDE_DIRECTORY} ) -set(PATHS - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${CMAKE_CURRENT_SOURCE_DIR}/src +set (SOURCES + ${COMPONENTS_DIR}/config_profile/src/profile.cc + ${COMPONENTS_DIR}/config_profile/src/ini_file.cc ) -set(LIBRARIES - Utils -) - -collect_sources(SOURCES "${PATHS}") add_library("ConfigProfile" ${SOURCES}) -target_link_libraries("ConfigProfile" ${LIBRARIES}) +target_link_libraries("ConfigProfile" Utils) if(BUILD_TESTS) add_subdirectory(test) diff --git a/src/components/config_profile/test/CMakeLists.txt b/src/components/config_profile/test/CMakeLists.txt index 597be8fe00..1246bff066 100644 --- a/src/components/config_profile/test/CMakeLists.txt +++ b/src/components/config_profile/test/CMakeLists.txt @@ -28,20 +28,23 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/sources.cmake) +if(BUILD_TESTS) include_directories ( ${GMOCK_INCLUDE_DIRECTORY} ${COMPONENTS_DIR}/config_profile/include ) + -set(LIBRARIES +set(testSources + profile_test.cc + ini_file_test.cc +) + +set(testLibraries gmock ConfigProfile ) - -collect_sources(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}") -create_test(config_profile_test "${SOURCES}" "${LIBRARIES}") file(COPY smartDeviceLink.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) file(COPY smartDeviceLink_test.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) @@ -49,3 +52,6 @@ file(COPY smartDeviceLink_invalid_pairs.ini DESTINATION ${CMAKE_CURRENT_BINARY_D file(COPY smartDeviceLink_invalid_string.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) file(COPY smartDeviceLink_invalid_int.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) file(COPY smartDeviceLink_invalid_boolean.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) +create_test("config_profile_test" "${testSources}" "${testLibraries}") + +endif() |