From 9d82e00fac6fd1c3c43676c4c74b5e892b503462 Mon Sep 17 00:00:00 2001 From: Jacopo Date: Mon, 28 Oct 2024 12:48:57 +0100 Subject: [PATCH] Update iCubDev CMakeLists.txt and update icub-main to v2.7.0 --- CMakeLists.txt | 2 +- src/libraries/iCubDev/CMakeLists.txt | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 61e41c7412..3e08eba87d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.12...3.28) set(ROOT_PROJECT_NAME ICUB) project(${ROOT_PROJECT_NAME} LANGUAGES C CXX - VERSION 2.6.3) + VERSION 2.7.0) set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_STANDARD 14) diff --git a/src/libraries/iCubDev/CMakeLists.txt b/src/libraries/iCubDev/CMakeLists.txt index 0fc9963061..4c2477e8be 100644 --- a/src/libraries/iCubDev/CMakeLists.txt +++ b/src/libraries/iCubDev/CMakeLists.txt @@ -28,8 +28,7 @@ add_library(${PROJECT_NAME} ${folder_source} ${folder_header} ${folder_idlgen}) add_library(ICUB::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) target_include_directories(${PROJECT_NAME} PUBLIC "$" "$" - "$" - "$") #need to keep this line to allow TelemetryDeviceDumper compilation + "$") target_link_libraries(${PROJECT_NAME} YARP::YARP_os YARP::YARP_dev) set_target_properties(${PROJECT_NAME} PROPERTIES @@ -46,7 +45,7 @@ install(TARGETS ${PROJECT_NAME} PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/iCub") -install(FILES ${folder_idlgen} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/autogenerated/iCub") +install(FILES ${folder_idlgen} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/iCub") icub_install_basic_package_files(${PROJECT_NAME} DEPENDENCIES YARP_os