diff options
Diffstat (limited to 'PluginCommandInterfaceCAPI')
| -rw-r--r-- | PluginCommandInterfaceCAPI/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | PluginCommandInterfaceCAPI/test/CMakeLists.txt | 27 |
2 files changed, 24 insertions, 18 deletions
diff --git a/PluginCommandInterfaceCAPI/CMakeLists.txt b/PluginCommandInterfaceCAPI/CMakeLists.txt index c30c009..50224d4 100644 --- a/PluginCommandInterfaceCAPI/CMakeLists.txt +++ b/PluginCommandInterfaceCAPI/CMakeLists.txt @@ -45,7 +45,16 @@ set(COMMAND_INTERFACE_DBUS_CONF ${COMMAND_INTERFACE_DBUS_CONF} PARENT_SCOPE) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/config.cmake ${CMAKE_CURRENT_SOURCE_DIR}/include/configCommandCAPI.h ) FIND_PACKAGE(CommonAPI REQUIRED) -FIND_PACKAGE(CommonAPI_DBus REQUIRED) + +# Find the common-api sources. +# The sources can be placed in the build directory (DESTINATION) or in the source tree (ALT_DESTINATION). +# The ALT_DESTINATION is used as fall back if the DESTINATION directory dosen't contain the sources or you just don't want to use the generator. +INCLUDE(CommonAPIGenerator) +COMMON_API_GENERATE_SOUCRES(TARGET COMMON_API_COMMAND_INTERFACE + FIDLS fidl/CommandInterface.fidl # a list with fidls + DESTINATION src-gen # a relative path to the build directory or an absolute path + ALT_DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/src-gen # an alternative relative/absolute path with common-api sources, usually in the source tree + DBUS) INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} @@ -55,12 +64,12 @@ INCLUDE_DIRECTORIES( ${DLT_INCLUDE_DIRS} ${COMMON_API_INCLUDE_DIRS} ${COMMON_API_DBUS_INCLUDE_DIRS} - ${COMMON_API_GEN_INCLUDE_DIR} + ${COMMON_API_COMMAND_INTERFACE_GEN_INCLUDE_DIR} ${INCLUDE_FOLDER} ) # all source files go here -file(GLOB PLUGINCAPI_SRCS_CXX "src/*.cpp" ${COMMON_API_GEN_SOURCES}) +file(GLOB PLUGINCAPI_SRCS_CXX "src/*.cpp" ${COMMON_API_COMMAND_INTERFACE_GEN_SOURCES}) add_library(PluginCommandInterfaceCAPI MODULE ${PLUGINCAPI_SRCS_CXX}) diff --git a/PluginCommandInterfaceCAPI/test/CMakeLists.txt b/PluginCommandInterfaceCAPI/test/CMakeLists.txt index 8dc6bfa..79d0c53 100644 --- a/PluginCommandInterfaceCAPI/test/CMakeLists.txt +++ b/PluginCommandInterfaceCAPI/test/CMakeLists.txt @@ -30,8 +30,7 @@ set(EXECUTABLE_OUTPUT_PATH ${TEST_EXECUTABLE_OUTPUT_PATH}) FIND_PACKAGE(Threads) FIND_PACKAGE(PkgConfig) FIND_PACKAGE(PythonLibs REQUIRED) -pkg_check_modules(PC_COMMON REQUIRED CommonAPI) -pkg_check_modules(PC_COMMON_DBUS REQUIRED CommonAPI-DBus) +FIND_PACKAGE(CommonAPI REQUIRED) IF(WITH_DLT) pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) @@ -44,8 +43,9 @@ INCLUDE_DIRECTORIES( ${AUDIO_INCLUDE_FOLDER} ${CMAKE_SOURCE_DIR} ${DLT_INCLUDE_DIRS} - ${PC_COMMON_INCLUDE_DIRS} - ${PC_COMMON_DBUS_INCLUDE_DIRS} + ${COMMON_API_INCLUDE_DIRS} + ${COMMON_API_DBUS_INCLUDE_DIRS} + ${COMMON_API_COMMAND_INTERFACE_GEN_INCLUDE_DIR} ${INCLUDE_FOLDER} ${PYTHON_INCLUDE_DIRS} ${GOOGLE_TEST_INCLUDE_DIR} @@ -56,25 +56,22 @@ INCLUDE_DIRECTORIES( link_directories( ${LINK_DIRECTORIES} - ${PC_COMMON_LIBRARY_DIRS} - ${PC_COMMON_DBUS_LIBRARY_DIRS} + ${COMMON_API_LIBRARY_DIRS} + ${COMMON_API_DBUS_LIBRARY_DIRS} ) file(GLOB CAPI_PLUGIN_INTERFACE_SRCS_CXX "../../AudioManagerDaemon/src/CAmCommonAPIWrapper.cpp" "../../AudioManagerDaemon/src/CAmSocketHandler.cpp" - "../../AudioManagerDaemon/src/CAmDltWrapper.cpp" - "../src/*.cpp" + "../../AudioManagerDaemon/src/CAmDltWrapper.cpp" "CAmCommandSenderCAPITest.cpp" "CAmTestCAPIWrapper.cpp" "CAmCommandSenderCommon.cpp" + "../src/*.cpp" + ${COMMON_API_COMMAND_INTERFACE_GEN_SOURCES} ) -file(GLOB_RECURSE CAPI_PLUGIN_INTERFACE_GEN_SRCS_CXX - "../src-gen/*.cpp" -) - -ADD_EXECUTABLE(AmCommandSenderCAPITest ${CAPI_PLUGIN_INTERFACE_SRCS_CXX} ${CAPI_PLUGIN_INTERFACE_GEN_SRCS_CXX}) +ADD_EXECUTABLE(AmCommandSenderCAPITest ${CAPI_PLUGIN_INTERFACE_SRCS_CXX}) TARGET_LINK_LIBRARIES(AmCommandSenderCAPITest ${DLT_LIBRARIES} @@ -82,8 +79,8 @@ TARGET_LINK_LIBRARIES(AmCommandSenderCAPITest ${CMAKE_THREAD_LIBS_INIT} ${PYTHON_LIBRARY} ${PC_GSTREAMER_LIBRARIES} - ${PC_COMMON_LIBRARIES} - ${PC_COMMON_DBUS_LIBRARIES} + ${COMMON_API_LIBRARIES} + ${COMMON_API_DBUS_LIBRARIES} gtest gmock ) |