diff options
Diffstat (limited to 'enhanced-position-service/franca/api/CMakeLists.txt')
| -rw-r--r-- | enhanced-position-service/franca/api/CMakeLists.txt | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/enhanced-position-service/franca/api/CMakeLists.txt b/enhanced-position-service/franca/api/CMakeLists.txt index c787944..416b84f 100644 --- a/enhanced-position-service/franca/api/CMakeLists.txt +++ b/enhanced-position-service/franca/api/CMakeLists.txt @@ -24,30 +24,11 @@ cmake_minimum_required (VERSION 2.8.1) PROJECT(EnhancedPositionService) -message("Project name: ${PROJECT_NAME}") - option(COMMONAPI_TOOL_GENERATOR "Absolute path to CommonAPI code generator" "") option(COMMONAPI_DBUS_TOOL_GENERATOR "Absolute path to CommonAPI-DBus code generator" "") -if (COMMONAPI_TOOL_GENERATOR) - message (STATUS "COMMONAPI_TOOL_GENERATOR = " ${COMMONAPI_TOOL_GENERATOR}) -else () - message (FATAL_ERROR "Set the variable -DCOMMONAPI_TOOL_GENERATOR=<path>") -endif () - - -if (COMMONAPI_DBUS_TOOL_GENERATOR) - message (STATUS "COMMONAPI_DBUS_TOOL_GENERATOR = " ${COMMONAPI_DBUS_TOOL_GENERATOR}) -else () - message (FATAL_ERROR "Set the variable -DCOMMONAPI_DBUS_TOOL_GENERATOR=<path>") -endif () - -#set(FRANCA_DIR "..") -#set(COMMONAPI_TOOL_GENERATOR "${FRANCA_DIR}/generators/common-api-tools/commonapi-generator-linux-x86" ) -#set(COMMONAPI_DBUS_TOOL_GENERATOR "${FRANCA_DIR}/generators/common-api-dbus-tools/commonapi-dbus-generator-linux-x86" ) - set(COMMONAPI_FIDL_DIR "${CMAKE_CURRENT_SOURCE_DIR}") set(COMMONAPI_GEN_DIR "${CMAKE_BINARY_DIR}/enhanced-position-service/franca/api") @@ -64,9 +45,17 @@ message("CMAKE_CURRENT_SOURCE_DIR" ${CMAKE_CURRENT_SOURCE_DIR}) file(GLOB FIDL_FILES "${COMMONAPI_FIDL_DIR}/*.fidl") message("FIDL_FILES: ${FIDL_FILES}") -execute_process(WORKING_DIRECTORY ${COMMONAPI_FIDL_DIR} +if (COMMONAPI_TOOL_GENERATOR) + execute_process(WORKING_DIRECTORY ${COMMONAPI_FIDL_DIR} COMMAND ${COMMONAPI_DBUS_TOOL_GENERATOR} -d ${COMMONAPI_GEN_DIR} ${FIDL_FILES}) -execute_process(WORKING_DIRECTORY ${COMMONAPI_FIDL_DIR} - COMMAND ${COMMONAPI_TOOL_GENERATOR} -sk -d ${COMMONAPI_GEN_DIR} ${FIDL_FILES}) +else () + message (FATAL_ERROR "Set the variable -DCOMMONAPI_TOOL_GENERATOR=<path>") +endif () +if (COMMONAPI_DBUS_TOOL_GENERATOR) + execute_process(WORKING_DIRECTORY ${COMMONAPI_FIDL_DIR} + COMMAND ${COMMONAPI_TOOL_GENERATOR} -sk -d ${COMMONAPI_GEN_DIR} ${FIDL_FILES}) +else () + message (FATAL_ERROR "Set the variable -DCOMMONAPI_DBUS_TOOL_GENERATOR=<path>") +endif () |