Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed installation of yarp_sig header files #3137

Merged
merged 1 commit into from
Sep 13, 2024
Merged

Fixed installation of yarp_sig header files #3137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 7 additions & 17 deletions src/libYARP_dev/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand All @@ -313,7 +316,6 @@ source_group(
${YARP_dev_devices_HDRS}
)


target_sources(YARP_dev
PRIVATE
${YARP_dev_SRCS}
Expand Down Expand Up @@ -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
Expand Down
13 changes: 5 additions & 8 deletions src/libYARP_sig/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
Loading