Skip to content

Commit bb4d43b

Browse files
Update ros-jazzy-fastrtps.patch
1 parent 8897579 commit bb4d43b

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

patch/ros-jazzy-fastrtps.patch

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,17 @@ index 75ad33f2d64..252f60c775a 100644
2727
+
2828
namespace eprosima {
2929

30-
template<typename... Args>
30+
template<typename... Args>
31+
diff --git a/tools/fds/CMakeLists.txt b/tools/fds/CMakeLists.txt
32+
index 899fe693..f1e7e37d 100644
33+
--- a/tools/fds/CMakeLists.txt
34+
+++ b/tools/fds/CMakeLists.txt
35+
@@ -116,7 +116,7 @@ install(EXPORT ${PROJECT_NAME}-targets
36+
if( WIN32 )
37+
# Use powershell to generate the link
38+
install(
39+
- CODE "execute_process( COMMAND PowerShell -Command \"if( test-path ${PROJECT_NAME}.exe -PathType Leaf ) { rm ${PROJECT_NAME}.exe } ; New-Item -ItemType SymbolicLink -Target $<TARGET_FILE_NAME:${PROJECT_NAME}> -Path ${PROJECT_NAME}.exe \" ERROR_QUIET RESULTS_VARIABLE SYMLINK_FAILED WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}\") \n if( SYMLINK_FAILED ) \n message(STATUS \"Windows requires admin installation rights to create symlinks. A bat script will be provided instead.\") \n set(FAST_SERVER_BINARY_NAME $<TARGET_FILE_NAME:${PROJECT_NAME}>) \n configure_file(${CMAKE_CURRENT_LIST_DIR}/fast-discovery-server.bat.in ${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}${MSVCARCH_DIR_EXTENSION}/${PROJECT_NAME}.bat @ONLY) \n endif()"
40+
+ CODE "execute_process( COMMAND PowerShell -Command \"if( test-path ${PROJECT_NAME}.exe -PathType Leaf ) { rm ${PROJECT_NAME}.exe } ; New-Item -ItemType HardLink -Target $<TARGET_FILE_NAME:${PROJECT_NAME}> -Path ${PROJECT_NAME}.exe \" ERROR_QUIET RESULTS_VARIABLE SYMLINK_FAILED WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}\") \n if( SYMLINK_FAILED ) \n message(STATUS \"Windows requires admin installation rights to create symlinks. A bat script will be provided instead.\") \n set(FAST_SERVER_BINARY_NAME $<TARGET_FILE_NAME:${PROJECT_NAME}>) \n configure_file(${CMAKE_CURRENT_LIST_DIR}/fast-discovery-server.bat.in ${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}${MSVCARCH_DIR_EXTENSION}/${PROJECT_NAME}.bat @ONLY) \n endif()"
41+
COMPONENT discovery)
42+
else()
43+
# Use ln to create the symbolic link. We remove the version from the file name but keep the debug suffix

0 commit comments

Comments
 (0)