Skip to content

Commit

Permalink
Fixed usv_water_current
Browse files Browse the repository at this point in the history
  • Loading branch information
lsa committed Aug 9, 2018
1 parent b5b1484 commit 268edc0
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 391 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
/* #undef BUILD_BULLET_PHYSICS */

//UWSim root folder
#define UWSIM_ROOT_PATH "/home/paravisi/usv_sim_lsa/install_isolated/share/uwsim"
#define UWSIM_ROOT_PATH "/home/lsa/usv_sim_lsa/install_isolated/share/uwsim"

//Operating system
/* #undef WIN32 */
Expand Down
18 changes: 0 additions & 18 deletions src/usv_water_current/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ project(usv_water_current)
## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
## is used, also find other catkin packages
find_package(catkin REQUIRED COMPONENTS
roscpp
rospy
std_msgs
nav_msgs
Expand Down Expand Up @@ -78,7 +77,6 @@ add_service_files(
## Generate added messages and services with any dependencies listed here
generate_messages(
DEPENDENCIES
roscpp
std_msgs
rosgraph_msgs
)
Expand Down Expand Up @@ -117,7 +115,6 @@ catkin_package(
#LIBRARIES usv_water_current
CATKIN_DEPENDS message_runtime roscpp std_msgs
DEPENDS
roscpp
nav_msgs
geometry_msgs
rosgraph_msgs
Expand Down Expand Up @@ -151,7 +148,6 @@ include_directories(
## Declare a C++ executable
## With catkin_make all packages are built within a single CMake context
## The recommended prefix ensures that target names across packages don't collide
add_executable(${PROJECT_NAME} src/main.cpp)

## Rename C++ executable without prefix
## The above recommended prefix causes long target names, the following renames the
Expand All @@ -164,12 +160,6 @@ add_executable(${PROJECT_NAME} src/main.cpp)
# add_dependencies(${PROJECT_NAME}_node ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})

## Specify libraries to link a library or executable target against
target_link_libraries(${PROJECT_NAME}
${catkin_LIBRARIES}
${YAMLCPP_LIBRARIES}
${SDL_LIBRARY}
${SDL_IMAGE_LIBRARIES}
)

#############
## Install ##
Expand Down Expand Up @@ -206,14 +196,6 @@ target_link_libraries(${PROJECT_NAME}
# DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
# )

install(
TARGETS
${PROJECT_NAME}
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
)

install(DIRECTORY maps/
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/maps)

Expand Down
165 changes: 0 additions & 165 deletions src/usv_water_current/src/image_loader.cpp

This file was deleted.

Loading

0 comments on commit 268edc0

Please sign in to comment.