diff options
| author | JackLivio <jack@livio.io> | 2020-03-04 11:12:56 -0500 |
|---|---|---|
| committer | JackLivio <jack@livio.io> | 2020-03-04 11:12:56 -0500 |
| commit | a089e018e968cad2f83660a3a27833f93ad362cf (patch) | |
| tree | bcc882566cd75f8322cab9a922d0bcff407de338 | |
| parent | e215b5307580177ce3d54f837e2edfa9ac99efbd (diff) | |
| download | sdl_core-fix/use_mobile_api_from_rpc_spec.tar.gz | |
Use mobile_api.xml from the rpc_spec directoryfix/use_mobile_api_from_rpc_spec
| -rw-r--r-- | src/components/interfaces/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/components/policy/policy_external/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/components/policy/policy_regular/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/components/utils/test/test_generator/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tools/cmake/helpers/generators.cmake | 6 |
5 files changed, 9 insertions, 8 deletions
diff --git a/src/components/interfaces/CMakeLists.txt b/src/components/interfaces/CMakeLists.txt index 1e63a14140..6a2946cea3 100644 --- a/src/components/interfaces/CMakeLists.txt +++ b/src/components/interfaces/CMakeLists.txt @@ -29,10 +29,7 @@ # POSSIBILITY OF SUCH DAMAGE. # Copy RPC spec submodule files to interfaces directory -if(EXISTS ${CMAKE_SOURCE_DIR}/tools/rpc_spec/) - execute_process(COMMAND cp ${CMAKE_SOURCE_DIR}/tools/rpc_spec/MOBILE_API.xml ${CMAKE_CURRENT_SOURCE_DIR}/) - execute_process(COMMAND cp ${CMAKE_SOURCE_DIR}/tools/rpc_spec/MOBILE_API.xsd ${CMAKE_CURRENT_SOURCE_DIR}/) -else () +if(NOT EXISTS ${CMAKE_SOURCE_DIR}/tools/rpc_spec/) message( FATAL_ERROR "Missing the RPC Spec submodule" ) message( FATAL_ERROR "Please run `git submodule init` in the SDL Core source directory" ) endif () diff --git a/src/components/policy/policy_external/CMakeLists.txt b/src/components/policy/policy_external/CMakeLists.txt index 361c48a598..71995b6408 100644 --- a/src/components/policy/policy_external/CMakeLists.txt +++ b/src/components/policy/policy_external/CMakeLists.txt @@ -76,7 +76,7 @@ set(GENERATED_MOBILE_POLICY_TYPES ${GENERATED_MOBILE_POLICY_TYPES_CPP}) generate_policy_types("${GENERATED_MOBILE_POLICY_TYPES}" - "${COMPONENTS_DIR}/interfaces/MOBILE_API.xml" + "${CMAKE_SOURCE_DIR}/tools/rpc_spec/MOBILE_API.xml" "rpc::policy_table_interface_base" "mobile-policy-types") diff --git a/src/components/policy/policy_regular/CMakeLists.txt b/src/components/policy/policy_regular/CMakeLists.txt index e14057ec89..690d1f4fad 100644 --- a/src/components/policy/policy_regular/CMakeLists.txt +++ b/src/components/policy/policy_regular/CMakeLists.txt @@ -61,7 +61,7 @@ set(GENERATED_MOBILE_POLICY_TYPES ${GENERATED_MOBILE_POLICY_TYPES_CPP}) generate_policy_types("${GENERATED_MOBILE_POLICY_TYPES}" - "${COMPONENTS_DIR}/interfaces/MOBILE_API.xml" + "${CMAKE_SOURCE_DIR}/tools/rpc_spec/MOBILE_API.xml" "rpc::policy_table_interface_base" "mobile-policy-types") diff --git a/src/components/utils/test/test_generator/CMakeLists.txt b/src/components/utils/test/test_generator/CMakeLists.txt index cd4243930a..4667a9b5f7 100644 --- a/src/components/utils/test/test_generator/CMakeLists.txt +++ b/src/components/utils/test/test_generator/CMakeLists.txt @@ -39,7 +39,7 @@ include_directories ( ${GMOCK_INCLUDE_DIRECTORY} ) -set(XML_NAME ${CMAKE_SOURCE_DIR}/src/components/interfaces/MOBILE_API.xml) +set(XML_NAME ${CMAKE_SOURCE_DIR}/tools/rpc_spec/MOBILE_API.xml) add_custom_target(generate_version COMMAND ${INTEFRACE_GENERATOR_CMD} "--source-xml" "${XML_NAME}" "--namespace" "mobile_apis" "--output-dir" "${CMAKE_CURRENT_BINARY_DIR}" "--parser-type" "sdlrpcv2" "-y" diff --git a/tools/cmake/helpers/generators.cmake b/tools/cmake/helpers/generators.cmake index 1a5a4b8fa1..af3e8c452a 100644 --- a/tools/cmake/helpers/generators.cmake +++ b/tools/cmake/helpers/generators.cmake @@ -63,7 +63,11 @@ macro(generate_interface ARG_XML_NAME ARG_NAMESPACE PARSER_TYPE) ) set(CPP_FILE "${CMAKE_CURRENT_BINARY_DIR}/${FILE_NAME}_schema.cc") - set(FULL_XML_NAME "${CMAKE_CURRENT_SOURCE_DIR}/${ARG_XML_NAME}") + if ("${PARSER_TYPE}" STREQUAL "sdlrpcv2") + set(FULL_XML_NAME "${CMAKE_SOURCE_DIR}/tools/rpc_spec/${ARG_XML_NAME}") + else () + set(FULL_XML_NAME "${CMAKE_CURRENT_SOURCE_DIR}/${ARG_XML_NAME}") + endif() add_custom_command( OUTPUT ${HPP_FILE} ${CPP_FILE} |