Skip to content
This repository has been archived by the owner on Sep 17, 2024. It is now read-only.

Commit

Permalink
Merge devel branch
Browse files Browse the repository at this point in the history
  • Loading branch information
adeguet1 committed Apr 7, 2021
1 parent cfcb0a8 commit 1f1630e
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions dvrk_arms_from_ros/components/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# (C) Copyright 2020 Johns Hopkins University (JHU), All Rights Reserved.
# (C) Copyright 2020-2021 Johns Hopkins University (JHU), All Rights Reserved.
#
# --- begin cisst license - do not edit ---
#
Expand Down Expand Up @@ -38,7 +38,7 @@ set (REQUIRED_CISST_LIBRARIES
cisstParameterTypes
)

find_package (cisst 1.0.11 REQUIRED ${REQUIRED_CISST_LIBRARIES})
find_package (cisst 1.1.0 REQUIRED ${REQUIRED_CISST_LIBRARIES})

if (cisst_FOUND_AS_REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion dvrk_arms_from_ros/components/package.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<package>
<name>dvrk_arms_from_ros</name>
<version>1.7.1</version>
<version>2.0.0</version>
<description>
sawIntuitiveResearchKit compatible arm from ROS topics
</description>
Expand Down
2 changes: 1 addition & 1 deletion dvrk_hrsv_widget/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>dvrk_hrsv_widget</name>
<version>0.0.0</version>
<version>2.0.0</version>
<description>dVRK HRSV widget</description>

<maintainer email="[email protected]">Anton Deguet</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion dvrk_model/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package>
<name>dvrk_model</name>
<version>1.7.0</version>
<version>2.0.0</version>
<description>The dvrk_model package</description>

<maintainer email="[email protected]">Anton Deguet</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion dvrk_python/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package>
<name>dvrk_python</name>
<version>1.7.0</version>
<version>2.0.0</version>
<description>The dVRK Python package</description>

<maintainer email="[email protected]">Anton Deguet</maintainer>
Expand Down
10 changes: 5 additions & 5 deletions dvrk_robot/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# (C) Copyright 2015-2020 Johns Hopkins University (JHU), All Rights Reserved.
# (C) Copyright 2015-2021 Johns Hopkins University (JHU), All Rights Reserved.
#
# --- begin cisst license - do not edit ---
#
Expand Down Expand Up @@ -44,7 +44,7 @@ set (REQUIRED_CISST_LIBRARIES
cisstQt
)

find_package (cisst 1.0.11 REQUIRED ${REQUIRED_CISST_LIBRARIES})
find_package (cisst 1.1.0 REQUIRED ${REQUIRED_CISST_LIBRARIES})

if (cisst_FOUND_AS_REQUIRED)

Expand All @@ -61,9 +61,9 @@ if (cisst_FOUND_AS_REQUIRED)


# sawRobotIO1394 has been compiled within cisst, we should find it automatically
find_package (sawRobotIO1394 1.7.0 REQUIRED)
find_package (sawControllers 1.7.0 REQUIRED)
find_package (sawIntuitiveResearchKit 1.7.0 REQUIRED)
find_package (sawRobotIO1394 2.0.0 REQUIRED)
find_package (sawControllers 2.0.0 REQUIRED)
find_package (sawIntuitiveResearchKit 2.0.0 REQUIRED)

include_directories (
${dvrk_robot_SOURCE_DIR}/include
Expand Down
2 changes: 1 addition & 1 deletion dvrk_robot/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package>
<name>dvrk_robot</name>
<version>1.7.0</version>
<version>2.0.0</version>
<description>The dvrk_robot package</description>

<maintainer email="[email protected]">Anton Deguet</maintainer>
Expand Down

0 comments on commit 1f1630e

Please sign in to comment.