diff options
| author | RomanReznichenkoLuxoft <85177915+RomanReznichenkoLuxoft@users.noreply.github.com> | 2022-01-10 20:16:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-10 13:16:44 -0500 |
| commit | eb14596e25cf6f49dd2ab21d39f32d3453615faa (patch) | |
| tree | f7af75664d331e940e5271bf261b0b77788cfa3d | |
| parent | 69e0ae4dd28191eca502ee23a781dceb51385c9b (diff) | |
| download | sdl_core-eb14596e25cf6f49dd2ab21d39f32d3453615faa.tar.gz | |
use files from the rps_spec folder without copying to the sdl_core (#3778)
| -rw-r--r-- | src/components/interfaces/CMakeLists.txt | 9 | ||||
| -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, 12 deletions
diff --git a/src/components/interfaces/CMakeLists.txt b/src/components/interfaces/CMakeLists.txt index 9679ccf0b4..5a87e69add 100644 --- a/src/components/interfaces/CMakeLists.txt +++ b/src/components/interfaces/CMakeLists.txt @@ -29,14 +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 ${CMAKE_COMMAND} -E copy_if_different - ${CMAKE_SOURCE_DIR}/tools/rpc_spec/MOBILE_API.xml - ${CMAKE_CURRENT_SOURCE_DIR}/MOBILE_API.xml) - execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${CMAKE_SOURCE_DIR}/tools/rpc_spec/MOBILE_API.xsd - ${CMAKE_CURRENT_SOURCE_DIR}/MOBILE_API.xsd) -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 update --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 0e3735093f..8b0572ba72 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 39c520a0e3..cc87e2c630 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..ae315ab1c6 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("${ARG_XML_NAME}" STREQUAL "MOBILE_API.xml") + 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} |