Skip to content

Commit

Permalink
Remove double // in some installation paths (#5111)
Browse files Browse the repository at this point in the history
Signed-off-by: eduponz <[email protected]>
(cherry picked from commit 8c477dc)

# Conflicts:
#	CMakeLists.txt
  • Loading branch information
EduPonz authored and mergify[bot] committed Aug 5, 2024
1 parent 55ca0aa commit 8cfca68
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -572,8 +572,13 @@ option(INSTALL_EXAMPLES "Install example" OFF)
if(INSTALL_EXAMPLES)
# Install examples
install(DIRECTORY ${PROJECT_SOURCE_DIR}/examples/cpp
<<<<<<< HEAD
DESTINATION examples/
COMPONENT examples
=======
DESTINATION ${DATA_INSTALL_DIR}/fastdds/examples
COMPONENT ${DATA_INSTALL_DIR}/fastdds/examples
>>>>>>> 8c477dce1 (Remove double // in some installation paths (#5111))
PATTERN "examples/CMakeLists.txt" EXCLUDE
)
endif()
Expand All @@ -583,7 +588,7 @@ option(INSTALL_TOOLS "Install tools" OFF)
if(INSTALL_TOOLS)
# Install tools
install(DIRECTORY ${PROJECT_SOURCE_DIR}/tools
DESTINATION tools/
DESTINATION tools
COMPONENT tools
PATTERN "tools/CMakeLists.txt" EXCLUDE
)
Expand Down

0 comments on commit 8cfca68

Please sign in to comment.