From 08f947b5ddd7e66c6b466a6c59b0ed091c36151e Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Sat, 24 Nov 2018 20:35:28 -0800 Subject: [PATCH] native path --- rosidl_cmake/cmake/rosidl_generate_interfaces.cmake | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/rosidl_cmake/cmake/rosidl_generate_interfaces.cmake b/rosidl_cmake/cmake/rosidl_generate_interfaces.cmake index 2256faee3..9c30c9625 100644 --- a/rosidl_cmake/cmake/rosidl_generate_interfaces.cmake +++ b/rosidl_cmake/cmake/rosidl_generate_interfaces.cmake @@ -70,6 +70,7 @@ macro(rosidl_generate_interfaces target) # of the base path and the relative path set(_interface_tuples "") foreach(_file ${_ARG_UNPARSED_ARGUMENTS}) + file(TO_CMAKE_PATH "${_file}" _file) if(IS_ABSOLUTE "${_file}") string(FIND "${_file}" ":" _index) if(_index EQUAL -1) @@ -90,7 +91,8 @@ macro(rosidl_generate_interfaces target) "'${_file}' doesn't exist relative to the " "CMAKE_CURRENT_SOURCE_DIR '${CMAKE_CURRENT_SOURCE_DIR}'") endif() - list(APPEND _interface_tuples "${CMAKE_CURRENT_SOURCE_DIR}:${_file}") + file(TO_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" _cmake_current_source_dir) + list(APPEND _interface_tuples "${_cmake_current_source_dir}:${_file}") endif() endforeach() @@ -131,7 +133,11 @@ macro(rosidl_generate_interfaces target) endif() endif() # afterwards all remaining interface files are .idl files - list(APPEND _idl_tuples ${_idl_adapter_tuples}) + foreach(_idl_adapter_tuple ${_idl_adapter_tuples}) + file(TO_CMAKE_PATH "${_idl_adapter_tuple}" _idl_adapter_tuple) + string(REPLACE ";" ":" _idl_adapter_tuple "${_idl_adapter_tuple}") + list(APPEND _idl_tuples "${_idl_adapter_tuple}") + endforeach() # collect all interface files from dependencies set(_dep_files)