Use dirent from extern and remove copies of the file

CC-Issue #384
robotology · Feb 18, 2018 · f3b7e53 · f3b7e53
1 parent 3b841f2
commit f3b7e53
Show file tree

Hide file tree

Showing 18 changed files with 32 additions and 706 deletions.
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
@@ -66,3 +66,8 @@ set(RPLIDAR_SDK_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/rplidar/sdk" PARENT_SCOPE)
 
 # diff_match_patch
 set(diff_match_patch_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/diff_match_patch" PARENT_SCOPE)
+
+# dirent (for MSVC)
+if(MSVC)
+  set(dirent_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/dirent/dirent/include" PARENT_SCOPE)
+endif()
diff --git a/src/libYARP_manager/CMakeLists.txt b/src/libYARP_manager/CMakeLists.txt
@@ -41,7 +41,6 @@ if(CREATE_LIB_MANAGER)
                         include/yarp/manager/xmltemploader.h
                         include/yarp/manager/yarpbroker.h
                         include/yarp/manager/yarpdevbroker.h
-                        include/yarp/manager/ymm-dir.h
                         include/yarp/manager/ymm-types.h)
 
   set(YARP_manager_IMPL_HDRS include/yarp/manager/impl/textparser.h)
@@ -87,7 +86,9 @@ if(CREATE_LIB_MANAGER)
 
   include_directories(${YARP_TREE_INCLUDE_DIRS})
   include_directories(SYSTEM ${TinyXML_INCLUDE_DIRS})
-
+  if(MSVC)
+    include_directories(SYSTEM ${dirent_INCLUDE_DIRS})
+  endif()
 
   if(CREATE_LIB_MATH)
     add_definitions( -DWITH_YARPMATH )

diff --git a/src/libYARP_manager/include/yarp/manager/ymm-dir.h b/src/libYARP_manager/include/yarp/manager/ymm-dir.h
diff --git a/src/libYARP_manager/src/xmlapploader.cpp b/src/libYARP_manager/src/xmlapploader.cpp
@@ -9,7 +9,7 @@
 
 #include <yarp/manager/xmlapploader.h>
 #include <yarp/manager/utility.h>
-#include <yarp/manager/ymm-dir.h>
+#include <dirent.h>
 #include <tinyxml.h>
 #include <yarp/os/Value.h>
 #ifdef WITH_GEOMETRY

diff --git a/src/libYARP_manager/src/xmlappsaver.cpp b/src/libYARP_manager/src/xmlappsaver.cpp
@@ -9,7 +9,7 @@
 
 #include <yarp/manager/xmlappsaver.h>
 #include <yarp/manager/utility.h>
-#include <yarp/manager/ymm-dir.h>
+#include <dirent.h>
 
 #include <algorithm>
 #include <cctype>

diff --git a/src/libYARP_manager/src/xmlclusterloader.cpp b/src/libYARP_manager/src/xmlclusterloader.cpp
@@ -7,7 +7,7 @@
 
 #include <yarp/manager/xmlclusterloader.h>
 #include <yarp/manager/utility.h>
-#include <yarp/manager/ymm-dir.h>
+#include <dirent.h>
 #include <tinyxml.h>
 #include <yarp/os/Value.h>
 

diff --git a/src/libYARP_manager/src/xmlmodloader.cpp b/src/libYARP_manager/src/xmlmodloader.cpp
@@ -9,7 +9,7 @@
 
 #include <yarp/manager/xmlmodloader.h>
 #include <yarp/manager/utility.h>
-#include <yarp/manager/ymm-dir.h>
+#include <dirent.h>
 #include <yarp/manager/physicresource.h>
 #include <yarp/manager/logicresource.h>
 #include <yarp/manager/primresource.h>

diff --git a/src/libYARP_manager/src/xmlresloader.cpp b/src/libYARP_manager/src/xmlresloader.cpp
@@ -9,7 +9,7 @@
 
 #include <yarp/manager/xmlresloader.h>
 #include <yarp/manager/utility.h>
-#include <yarp/manager/ymm-dir.h>
+#include <dirent.h>
 #include <yarp/manager/physicresource.h>
 #include <yarp/manager/logicresource.h>
 

diff --git a/src/libYARP_manager/src/xmltemploader.cpp b/src/libYARP_manager/src/xmltemploader.cpp
@@ -9,7 +9,7 @@
 
 #include <yarp/manager/xmltemploader.h>
 #include <yarp/manager/utility.h>
-#include <yarp/manager/ymm-dir.h>
+#include <dirent.h>
 
 #include <algorithm>
 #include <cctype>