diff options
| author | conlain-k <conlain.k@gmail.com> | 2018-07-24 15:31:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-24 15:31:47 -0400 |
| commit | 90db9ca480eabeaf85ec77626b1bf10fa491270d (patch) | |
| tree | 1061840e02be20e216cca72685113ceffd592981 /tools/intergen/test/CMakeLists.txt | |
| parent | e1d597dafe130e73d68d7ccbd84a6b63db2a329f (diff) | |
| parent | a773acc84a6836129f1d9bc4b8b723b9e7301e0c (diff) | |
| download | sdl_core-90db9ca480eabeaf85ec77626b1bf10fa491270d.tar.gz | |
Merge branch 'develop' into feature/boost_filesystem_implementation
Diffstat (limited to 'tools/intergen/test/CMakeLists.txt')
| -rw-r--r-- | tools/intergen/test/CMakeLists.txt | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/tools/intergen/test/CMakeLists.txt b/tools/intergen/test/CMakeLists.txt index f2973dd71c..7695ec419c 100644 --- a/tools/intergen/test/CMakeLists.txt +++ b/tools/intergen/test/CMakeLists.txt @@ -30,11 +30,7 @@ if(BUILD_TESTS) include(${CMAKE_SOURCE_DIR}/tools/intergen/GenerateInterfaceLibrary.cmake) -if (${HMI_DBUS_API}) - GenerateInterfaceLibrary("test_interface.xml" test_rpc_interface DBUS_SUPPORT) -else() - GenerateInterfaceLibrary("test_interface.xml" test_rpc_interface) -endif() +GenerateInterfaceLibrary("test_interface.xml" test_rpc_interface) set (TEST_HMI_INTERFACES common @@ -45,11 +41,7 @@ set (TEST_HMI_INTERFACES ui ) -if (${HMI_DBUS_API}) - GenerateInterfaceLibrary("test_hmi_interface.xml" "${TEST_HMI_INTERFACES}" AUTO_FUNC_IDS DBUS_SUPPORT) -else() - GenerateInterfaceLibrary("test_hmi_interface.xml" "${TEST_HMI_INTERFACES}" AUTO_FUNC_IDS) -endif() +GenerateInterfaceLibrary("test_hmi_interface.xml" "${TEST_HMI_INTERFACES}" AUTO_FUNC_IDS) include_directories ( ${CMAKE_SOURCE_DIR}/src/components/rpc_base/include @@ -70,16 +62,5 @@ set (SOURCES generated_interface_json_tests.cc ) -if (${HMI_DBUS_API}) - # Build dbus tests - include_directories( - ${CMAKE_SOURCE_DIR}/src/components/dbus/include - ${DBUS_INCLUDE_DIRS} - ) - set (LIBRARIES ${LIBRARIES} DBus) - set (SOURCES ${SOURCES} generated_interface_dbus_tests.cc) -endif () - - create_test(test_generated_interface "${SOURCES}" "${LIBRARIES}") endif() |