remove thrift/ in include and fix compilation with YARP 3.2.101

devices/IWearRemapper/src/IWearRemapper.cpp

@@ -9,8 +9,8 @@
 #include "IWearRemapper.h"
 #include "Wearable/IWear/IWear.h"
 #include "Wearable/IWear/Sensors/impl/SensorsImpl.h"
-#include "thrift/WearableData.h"
-#include "thrift/WearableMetadataService.h"
+#include "WearableData.h"
+#include "WearableMetadataService.h"
 
 #include <yarp/dev/PreciselyTimed.h>
 #include <yarp/os/BufferedPort.h>

msgs/CMakeLists.txt

@@ -1,82 +1,5 @@
-# Copyright (C) 2018 Istituto Italiano di Tecnologia (IIT). All rights reserved.
+# Copyright (C) 2019 Istituto Italiano di Tecnologia (IIT). All rights reserved.
 # This software may be modified and distributed under the terms of the
 # GNU Lesser General Public License v2.1 or any later version.
 
-# TODO: these libraries are enforced to be static. In order to let the devices
-#       find them on Windows from the build directory, their Release / Debug
-#       folder should be added to the PATH. However, this does not work as expected.
-
-# ============
-# WearableData
-# ============
-
-yarp_add_idl(WEARABLEDATA_FILES thrift/WearableData.thrift)
-
-add_library(WearableData ${WEARABLEDATA_FILES} thrift/WearableData.thrift)
-add_library(Wearable::WearableData ALIAS WearableData)
-target_link_libraries(WearableData YARP::YARP_OS)
-
-# Extract the include directory from the files names
-foreach(file ${WEARABLEDATA_FILES})
-    STRING(REGEX MATCH ".+\\.h?h$" file ${file})
-    if(file)
-        get_filename_component(include_dir ${file} DIRECTORY)
-        list(APPEND WEARABLEDATA_INCLUDE_DIRS ${include_dir})
-        list(REMOVE_DUPLICATES WEARABLEDATA_INCLUDE_DIRS)
-    endif()
-endforeach()
-
-foreach(dir ${WEARABLEDATA_INCLUDE_DIRS})
-    get_filename_component(parent_dir_name ${dir} NAME)
-    if(${parent_dir_name} STREQUAL thrift)
-        list(REMOVE_ITEM WEARABLEDATA_INCLUDE_DIRS ${dir})
-        get_filename_component(parent_dir_path ${dir} DIRECTORY)
-        list(APPEND WEARABLEDATA_INCLUDE_DIRS ${parent_dir_path})
-    endif()
-endforeach()
-
-# Setup the include directories
-target_include_directories(WearableData PUBLIC
-    $<BUILD_INTERFACE:${WEARABLEDATA_INCLUDE_DIRS}>)
-
-install(TARGETS WearableData
-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
-# =======================
-# XsensSuitControlService
-# =======================
-
-yarp_add_idl(XSENSSUITCONTROL thrift/XsensSuitControlService.thrift)
-
-add_library(XsensSuitControl ${XSENSSUITCONTROL} thrift/XsensSuitControlService.thrift)
-target_link_libraries(XsensSuitControl YARP::YARP_OS)
-
-# Extract the include directory from the files names
-foreach(file ${XSENSSUITCONTROL})
-    STRING(REGEX MATCH ".+\\.h?h$" file ${file})
-    if(file)
-        get_filename_component(include_dir ${file} DIRECTORY)
-        list(APPEND XSENSSUITCONTROL_INCLUDE_DIRS ${include_dir})
-        list(REMOVE_DUPLICATES XSENSSUITCONTROL_INCLUDE_DIRS)
-    endif()
-endforeach()
-
-foreach(dir ${XSENSSUITCONTROL_INCLUDE_DIRS})
-    get_filename_component(parent_dir_name ${dir} NAME)
-    if(${parent_dir_name} STREQUAL thrift)
-        list(REMOVE_ITEM XSENSSUITCONTROL_INCLUDE_DIRS ${dir})
-        get_filename_component(parent_dir_path ${dir} DIRECTORY)
-        list(APPEND XSENSSUITCONTROL_INCLUDE_DIRS ${parent_dir_path})
-    endif()
-endforeach()
-
-# Setup the include directories
-target_include_directories(XsensSuitControl PUBLIC
-    $<BUILD_INTERFACE:${XSENSSUITCONTROL_INCLUDE_DIRS}>)
-
-install(TARGETS XsensSuitControl
-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+add_subdirectory(thrift)

msgs/thrift/CMakeLists.txt

@@ -0,0 +1,84 @@
+# Copyright (C) 2018 Istituto Italiano di Tecnologia (IIT). All rights reserved.
+# This software may be modified and distributed under the terms of the
+# GNU Lesser General Public License v2.1 or any later version.
+
+# TODO: these libraries are enforced to be static. In order to let the devices
+#       find them on Windows from the build directory, their Release / Debug
+#       folder should be added to the PATH. However, this does not work as expected.
+
+# ============
+# WearableData
+# ============
+
+yarp_add_idl(WEARABLEDATA_FILES WearableData.thrift)
+
+add_library(WearableData ${WEARABLEDATA_FILES} WearableData.thrift)
+add_library(Wearable::WearableData ALIAS WearableData)
+target_link_libraries(WearableData YARP::YARP_OS)
+
+# Extract the include directory from the files names
+foreach(file ${WEARABLEDATA_FILES})
+    STRING(REGEX MATCH ".+\\.h?h$" file ${file})
+    if(file)
+        get_filename_component(include_dir ${file} DIRECTORY)
+        list(APPEND WEARABLEDATA_INCLUDE_DIRS ${include_dir})
+        list(REMOVE_DUPLICATES WEARABLEDATA_INCLUDE_DIRS)
+    endif()
+endforeach()
+
+foreach(dir ${WEARABLEDATA_INCLUDE_DIRS})
+    get_filename_component(parent_dir_name ${dir} NAME)
+    if(${parent_dir_name} STREQUAL thrift)
+        list(REMOVE_ITEM WEARABLEDATA_INCLUDE_DIRS ${dir})
+        get_filename_component(parent_dir_path ${dir} DIRECTORY)
+        list(APPEND WEARABLEDATA_INCLUDE_DIRS ${parent_dir_path})
+    endif()
+endforeach()
+
+# Setup the include directories
+target_include_directories(WearableData PUBLIC
+    $<BUILD_INTERFACE:${WEARABLEDATA_INCLUDE_DIRS}>)
+target_include_directories(WearableData PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
+
+install(TARGETS WearableData
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+# =======================
+# XsensSuitControlService
+# =======================
+
+yarp_add_idl(XSENSSUITCONTROL XsensSuitControlService.thrift)
+
+add_library(XsensSuitControl ${XSENSSUITCONTROL} XsensSuitControlService.thrift)
+target_link_libraries(XsensSuitControl YARP::YARP_OS)
+
+# Extract the include directory from the files names
+foreach(file ${XSENSSUITCONTROL})
+    STRING(REGEX MATCH ".+\\.h?h$" file ${file})
+    if(file)
+        get_filename_component(include_dir ${file} DIRECTORY)
+        list(APPEND XSENSSUITCONTROL_INCLUDE_DIRS ${include_dir})
+        list(REMOVE_DUPLICATES XSENSSUITCONTROL_INCLUDE_DIRS)
+    endif()
+endforeach()
+
+foreach(dir ${XSENSSUITCONTROL_INCLUDE_DIRS})
+    get_filename_component(parent_dir_name ${dir} NAME)
+    if(${parent_dir_name} STREQUAL thrift)
+        list(REMOVE_ITEM XSENSSUITCONTROL_INCLUDE_DIRS ${dir})
+        get_filename_component(parent_dir_path ${dir} DIRECTORY)
+        list(APPEND XSENSSUITCONTROL_INCLUDE_DIRS ${parent_dir_path})
+    endif()
+endforeach()
+
+# Setup the include directories
+target_include_directories(XsensSuitControl PUBLIC
+    $<BUILD_INTERFACE:${XSENSSUITCONTROL_INCLUDE_DIRS}>)
+
+install(TARGETS XsensSuitControl
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})

wrappers/IWear/src/IWearWrapper.cpp

@@ -8,8 +8,8 @@
 
 #include "IWearWrapper.h"
 #include "Wearable/IWear/IWear.h"
-#include "thrift/WearableData.h"
-#include "thrift/WearableMetadataService.h"
+#include "WearableData.h"
+#include "WearableMetadataService.h"
 
 #include <yarp/dev/PreciselyTimed.h>
 #include <yarp/os/BufferedPort.h>

wrappers/IXsensMVNControl/src/IXsensMVNControlWrapper.cpp

@@ -9,7 +9,7 @@
 #include "IXsensMVNControlWrapper.h"
 #include "IXsensMVNControl.h"
 
-#include "thrift/XsensSuitControlService.h"
+#include "XsensSuitControlService.h"
 
 #include <yarp/os/BufferedPort.h>
 #include <yarp/os/LogStream.h>