Merge pull request #3137 from robotology/fix_yarpsig_install

Fixed installation of yarp_sig header files
robotology · Sep 13, 2024 · 627c4e3 · 627c4e3
2 parents 9e4dfb7 + a53da60
commit 627c4e3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 25 deletions.
diff --git a/src/libYARP_dev/src/CMakeLists.txt b/src/libYARP_dev/src/CMakeLists.txt
@@ -288,10 +288,13 @@ foreach(_f IN LISTS YARP_dev_idl_GEN_FILES)
   endif()
 endforeach()
 
+#message ("YARP_dev_idl_HDRS: ${YARP_dev_idl_HDRS}")
+#message ("YARP_dev_idl_GEN_FILES: ${YARP_dev_idl_GEN_FILES}")
 source_group(
   TREE "${CMAKE_CURRENT_SOURCE_DIR}"
   PREFIX "Source Files"
-  FILES ${YARP_dev_SRCS}
+  FILES
+    ${YARP_dev_SRCS}
 )
 source_group(
   TREE "${CMAKE_CURRENT_SOURCE_DIR}"
@@ -313,7 +316,6 @@ source_group(
     ${YARP_dev_devices_HDRS}
 )
 
-
 target_sources(YARP_dev
   PRIVATE
     ${YARP_dev_SRCS}
@@ -356,25 +358,13 @@ if(YARP_HAS_ZLIB)
   list(APPEND YARP_dev_PRIVATE_DEPS ZLIB)
 endif()
 
-set_property(
-  TARGET YARP_dev
-  PROPERTY
-    PUBLIC_HEADER
-      ${YARP_dev_HDRS}
-      ${YARP_dev_idl_HDRS}
-)
-set_property(
-  TARGET YARP_dev
-  PROPERTY
-    PRIVATE_HEADER
-      ${YARP_dev_IMPL_HDRS}
-      ${YARP_dev_idl_IMPL_HDRS}
-)
+#prepare installation
+set_property(TARGET YARP_dev PROPERTY PUBLIC_HEADER ${YARP_dev_HDRS} ${YARP_dev_idl_HDRS})
+set_property(TARGET YARP_dev PROPERTY PRIVATE_HEADER ${YARP_dev_IMPL_HDRS} ${YARP_dev_idl_IMPL_HDRS})
 set_property(TARGET YARP_dev PROPERTY VERSION ${YARP_VERSION_SHORT})
 set_property(TARGET YARP_dev PROPERTY SOVERSION ${YARP_SOVERSION})
 set_property(TARGET YARP_dev PROPERTY FOLDER "Libraries")
 
-
 install(
   TARGETS YARP_dev
   EXPORT YARP_dev

diff --git a/src/libYARP_sig/src/CMakeLists.txt b/src/libYARP_sig/src/CMakeLists.txt
@@ -32,12 +32,6 @@ set(YARP_sig_HDRS
   yarp/sig/Vector.h
 )
 
-if(NOT YARP_NO_DEPRECATED) # Since YARP 3.0.0
-  list(APPEND YARP_sig_HDRS
-    yarp/sig/IplImage.h
-  )
-endif()
-
 set(YARP_sig_SRCS
   yarp/sig/AudioBufferSize.cpp
   yarp/sig/Image.cpp
@@ -92,6 +86,9 @@ foreach(_f IN LISTS YARP_sig_idl_GEN_FILES)
   endif()
 endforeach()
 
+#message ("YARP_sig_idl_HDRS: ${YARP_sig_idl_HDRS}")
+#message ("YARP_sig_idl_GEN_FILES: ${YARP_sig_idl_GEN_FILES}")
+
 source_group(
   TREE "${CMAKE_CURRENT_SOURCE_DIR}"
   PREFIX "Source Files"
@@ -190,13 +187,13 @@ if (YARP_HAS_FFMPEG)
   # list(APPEND YARP_sig_PRIVATE_DEPS FFMPEG) # Not using targets
 endif()
 
-set_property(TARGET YARP_sig PROPERTY PUBLIC_HEADER ${YARP_sig_HDRS})
+#prepare installation
+set_property(TARGET YARP_sig PROPERTY PUBLIC_HEADER ${YARP_sig_HDRS} ${YARP_sig_idl_HDRS})
 set_property(TARGET YARP_sig PROPERTY PRIVATE_HEADER ${YARP_sig_IMPL_HDRS})
 set_property(TARGET YARP_sig PROPERTY VERSION ${YARP_VERSION_SHORT})
 set_property(TARGET YARP_sig PROPERTY SOVERSION ${YARP_SOVERSION})
 set_property(TARGET YARP_sig PROPERTY FOLDER "Libraries")
 
-
 install(
   TARGETS YARP_sig
   EXPORT YARP_sig