Skip to content

Commit

Permalink
debug the loop of link problem
Browse files Browse the repository at this point in the history
update to Copy Correctly
  • Loading branch information
baxter committed Oct 1, 2014
1 parent fbb12e5 commit bc6a057
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 12 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
*~
*.pyc
jsk_baxter_robot/jsk_baxter_web/www/baxter_description
13 changes: 1 addition & 12 deletions jsk_baxter_robot/jsk_baxter_web/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
cmake_minimum_required(VERSION 2.8.3)
project(jsk_baxter_web)

## Find catkin macros and libraries
## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
## is used, also find other catkin packages
find_package(catkin REQUIRED COMPONENTS
rosbridge_server
baxter_description
robot_state_publisher
tf2_web_republisher
)

##Set the symbolic link below www
execute_process(COMMAND rospack find baxter_description OUTPUT_VARIABLE baxter_description_PACKAGE_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND ln -s ${baxter_description_PACKAGE_PATH} ${PROJECT_SOURCE_DIR}/www/baxter_description OUTPUT_VARIABLE OUTPUT OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND cp -Ru ${baxter_description_PACKAGE_PATH} ${PROJECT_SOURCE_DIR}/www/ OUTPUT_VARIABLE OUTPUT OUTPUT_STRIP_TRAILING_WHITESPACE)

catkin_package(
# INCLUDE_DIRS include
Expand All @@ -22,13 +18,6 @@ catkin_package(
# DEPENDS system_lib
)

###########
## Build ##
###########

## Specify additional locations of header files
## Your package locations should be listed before other locations
# include_directories(include)
include_directories(
${catkin_INCLUDE_DIRS}
)

0 comments on commit bc6a057

Please sign in to comment.