native path

ros2 · Nov 25, 2018 · 8f8beed · 8f8beed
1 parent 6f7dc95
commit 8f8beed
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/rosidl_adapter/rosidl_adapter/main.py b/rosidl_adapter/rosidl_adapter/main.py
@@ -14,6 +14,7 @@
 
 import argparse
 import json
+import os
 import pathlib
 import sys
 
@@ -57,4 +58,5 @@ def main(argv=sys.argv[1:]):
     output_file.parent.mkdir(exist_ok=True)
     with output_file.open('w') as h:
         for basepath, relative_path in idl_tuples:
-            h.write('{basepath}:{relative_path}\n'.format_map(locals()))
+            line = '{basepath}:{relative_path}\n'.format_map(locals())
+            h.write(line.replace(os.sep, '/'))
diff --git 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()