diff options
| author | Marco Residori <marco.residori@xse.de> | 2015-08-05 18:05:16 +0200 |
|---|---|---|
| committer | Marco Residori <marco.residori@xse.de> | 2015-08-05 18:05:16 +0200 |
| commit | d965ba03e555537041d974de812d75967002a410 (patch) | |
| tree | 53f3a3a867e5838ab90228a05888667dd2954fed | |
| parent | 32f9e5ce48f76c5c9833dda0e1743ab8b45dc574 (diff) | |
| download | positioning-d965ba03e555537041d974de812d75967002a410.tar.gz | |
Add support for CommonAPI 3.1.3
| -rw-r--r-- | enhanced-position-service/franca/api/CMakeLists.txt | 6 | ||||
| -rwxr-xr-x | enhanced-position-service/franca/src/CMakeLists.txt | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/enhanced-position-service/franca/api/CMakeLists.txt b/enhanced-position-service/franca/api/CMakeLists.txt index 416b84f..cfc964d 100644 --- a/enhanced-position-service/franca/api/CMakeLists.txt +++ b/enhanced-position-service/franca/api/CMakeLists.txt @@ -45,16 +45,18 @@ message("CMAKE_CURRENT_SOURCE_DIR" ${CMAKE_CURRENT_SOURCE_DIR}) file(GLOB FIDL_FILES "${COMMONAPI_FIDL_DIR}/*.fidl") message("FIDL_FILES: ${FIDL_FILES}") -if (COMMONAPI_TOOL_GENERATOR) +if (COMMONAPI_DBUS_TOOL_GENERATOR) execute_process(WORKING_DIRECTORY ${COMMONAPI_FIDL_DIR} COMMAND ${COMMONAPI_DBUS_TOOL_GENERATOR} -d ${COMMONAPI_GEN_DIR} ${FIDL_FILES}) + message("COMMONAPI_DBUS_TOOL_GENERATOR=" ${COMMONAPI_DBUS_TOOL_GENERATOR}) else () message (FATAL_ERROR "Set the variable -DCOMMONAPI_TOOL_GENERATOR=<path>") endif () -if (COMMONAPI_DBUS_TOOL_GENERATOR) +if (COMMONAPI_TOOL_GENERATOR) execute_process(WORKING_DIRECTORY ${COMMONAPI_FIDL_DIR} COMMAND ${COMMONAPI_TOOL_GENERATOR} -sk -d ${COMMONAPI_GEN_DIR} ${FIDL_FILES}) + message("COMMONAPI_TOOL_GENERATOR=" ${COMMONAPI_TOOL_GENERATOR}) else () message (FATAL_ERROR "Set the variable -DCOMMONAPI_DBUS_TOOL_GENERATOR=<path>") endif () diff --git a/enhanced-position-service/franca/src/CMakeLists.txt b/enhanced-position-service/franca/src/CMakeLists.txt index b117ec2..e9b17f6 100755 --- a/enhanced-position-service/franca/src/CMakeLists.txt +++ b/enhanced-position-service/franca/src/CMakeLists.txt @@ -23,8 +23,8 @@ message(STATUS "WITH_TESTS = ${WITH_TESTS}") message(STATUS "WITH_DEBUG = ${WITH_DEBUG}") find_package(PkgConfig REQUIRED) -find_package(CommonAPI 3.1.2 REQUIRED) -find_package(CommonAPI-DBus 3.1.2 REQUIRED) +find_package(CommonAPI 3.1.3 REQUIRED) +find_package(CommonAPI-DBus 3.1.3 REQUIRED) # CommonAPI include(FindPkgConfig) @@ -77,6 +77,8 @@ set(LIBRARIES ${DBUS_LIBRARIES} ${gnss-service_LIBRARIES} ${sensors-service_LIBRARIES} + CommonAPI + CommonAPI-DBus ) if(WITH_DLT) @@ -93,10 +95,10 @@ endif() # Build Client add_executable(${PRJ_NAME_CLIENT} ${PRJ_CLIENT_SRCS}) -target_link_libraries(${PRJ_NAME_CLIENT} ${LIBRARIES} CommonAPI CommonAPI-DBus) +target_link_libraries(${PRJ_NAME_CLIENT} ${LIBRARIES}) # Build service add_executable(${PRJ_NAME_SERVICE} ${PRJ_SERVICE_SRCS}) -target_link_libraries(${PRJ_NAME_SERVICE} ${LIBRARIES} CommonAPI CommonAPI-DBus) +target_link_libraries(${PRJ_NAME_SERVICE} ${LIBRARIES}) |