Skip to content

Commit

Permalink
Greedy ign- migrations
Browse files Browse the repository at this point in the history
Signed-off-by: methylDragon <[email protected]>
  • Loading branch information
methylDragon committed Jul 11, 2022
1 parent 20efce1 commit 9ba5662
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion INSTALL_WINDOWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ directories including your DLL dependencies to let Windows find dynamic libs
(similar to `LD_LIBRARY_PATH` on Linux). Don't put quotes around the path, even
if it contains spaces. E.g., if you're working in `C:\My Stuff\gz-ws`:

set PATH=%PATH%;C:\My Stuff\gz-ws\ZeroMQ 4.0.4\bin;C:\My Stuff\gz-ws\ign-msgs\build\install\Release\lib
set PATH=%PATH%;C:\My Stuff\gz-ws\ZeroMQ 4.0.4\bin;C:\My Stuff\gz-ws\gz-msgs\build\install\Release\lib

1. Now build the examples:

Expand Down
4 changes: 2 additions & 2 deletions docker/gz-transport/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ RUN sudo /bin/sh -c 'echo "deb [trusted=yes] http://packages.osrfoundation.org/g
libgz-utils2-cli-dev \
&& sudo apt-get clean

# Ignition transport
# Gazebo transport
RUN git clone https://github.com/gazebosim/gz-transport.git \
&& cd gz-transport \
&& mkdir build \
Expand All @@ -79,7 +79,7 @@ RUN git clone https://github.com/gazebosim/gz-transport.git \
&& sudo make -j4 install \
&& cd ../..

# Ignition transport examples
# Gazebo transport examples
RUN cd gz-transport/example \
&& mkdir build \
&& cd build \
Expand Down
4 changes: 2 additions & 2 deletions example/configure.bat
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

@set PROTOBUF_PATH=%cd%\..\..\..\protobuf-2.6.0-win%build_bitness%-vc12
@set GZ_TRANSPORT_PATH=%cd%\..\..\build\install\%build_type%
@set GZ-MSGS_PATH=%cd%\..\..\..\ign-msgs\build\install\%build_type%
@set GZ-MSGS_PATH=%cd%\..\..\..\gz-msgs\build\install\%build_type%
@set GZ-MSGS_CMAKE_PREFIX_PATH=%GZ-MSGS_PATH%\CMake
@set GZ-MATH_PATH=%cd%\..\..\..\ign-math\build\install\%build_type%
@set GZ-MATH_PATH=%cd%\..\..\..\gz-math\build\install\%build_type%
@set GZ-MATH_CMAKE_PREFIX_PATH=%GZ-MATH_PATH%\CMake

cmake -G "NMake Makefiles"^
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ target_link_libraries(${topic_executable}
install(TARGETS ${topic_executable} DESTINATION ${GZ_LIB_INSTALL_DIR}/gz/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}/)

# Build service CLI executable
set(service_executable ign-transport-service)
set(service_executable gz-transport-service)
add_executable(${service_executable} service_main.cc)
target_link_libraries(${service_executable}
gz
Expand Down

0 comments on commit 9ba5662

Please sign in to comment.