Update iCubDev CMakeLists.txt and update icub-main to v2.7.0

robotology · Oct 28, 2024 · 9d82e00 · 9d82e00
1 parent 054ebb5
commit 9d82e00
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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 "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
                                                   "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/autogenerated>"
-                                                  "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
-                                                  "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/autogenerated>") #need to keep this line to allow TelemetryDeviceDumper compilation
+                                                  "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>") 
 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