Skip to content

Commit

Permalink
set version to 1.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
adeguet1 committed May 16, 2018
1 parent 744fa02 commit c42ad74
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 22 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Change log
==========

1.6.0 (2018-xx-xx)
1.6.0 (2018-05-16)
==================

* API changes:
Expand Down
8 changes: 4 additions & 4 deletions applications/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ set (REQUIRED_CISST_LIBRARIES cisstCommon
cisstQt)

# find cisst and make sure the required libraries have been compiled
find_package (cisst 1.0.9 REQUIRED ${REQUIRED_CISST_LIBRARIES})
find_package (cisst 1.0.10 REQUIRED ${REQUIRED_CISST_LIBRARIES})

if (cisst_FOUND_AS_REQUIRED)

Expand All @@ -45,9 +45,9 @@ if (cisst_FOUND_AS_REQUIRED)
endif ()

# saw components have been compiled within cisst, we should find them automatically
find_package (sawRobotIO1394 1.5.0 REQUIRED)
find_package (sawControllers 1.5.0 REQUIRED)
find_package (sawIntuitiveResearchKit 1.5.0 REQUIRED)
find_package (sawRobotIO1394 1.6.0 REQUIRED)
find_package (sawControllers 1.6.0 REQUIRED)
find_package (sawIntuitiveResearchKit 1.6.0 REQUIRED)
find_package (sawTextToSpeech REQUIRED)

if (sawRobotIO1394_FOUND AND sawControllers_FOUND
Expand Down
4 changes: 2 additions & 2 deletions applications/gripper-calibration/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ set (REQUIRED_CISST_LIBRARIES cisstCommon
cisstParameterTypes)

# find cisst and make sure the required libraries have been compiled
find_package (cisst 1.0.9 REQUIRED ${REQUIRED_CISST_LIBRARIES})
find_package (cisst 1.0.10 REQUIRED ${REQUIRED_CISST_LIBRARIES})

if (cisst_FOUND_AS_REQUIRED)

Expand All @@ -34,7 +34,7 @@ if (cisst_FOUND_AS_REQUIRED)
endif ()

# saw components have been compiled within cisst, we should find them automatically
find_package (sawRobotIO1394 1.5.0 REQUIRED)
find_package (sawRobotIO1394 1.6.0 REQUIRED)

if (sawRobotIO1394_FOUND)

Expand Down
2 changes: 1 addition & 1 deletion applications/package.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<package>
<name>saw_intuitive_research_kit_applications</name>
<version>1.5.0</version>
<version>1.6.0</version>
<description>
sawIntuitiveResearchKit Application
</description>
Expand Down
11 changes: 5 additions & 6 deletions components/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ set (REQUIRED_CISST_LIBRARIES
cisstRobot
cisstNumerical)

find_package (cisst 1.0.9 REQUIRED ${REQUIRED_CISST_LIBRARIES})
find_package (cisst 1.0.10 REQUIRED ${REQUIRED_CISST_LIBRARIES})

if (cisst_FOUND)

Expand All @@ -39,10 +39,9 @@ if (cisst_FOUND)
endif ()

# saw components have been compiled within cisst, we should find them automatically
find_package (sawTextToSpeech 1.1.0 REQUIRED)
find_package (sawRobotIO1394 1.5.0 REQUIRED)
find_package (sawControllers 1.5.0 REQUIRED)

find_package (sawTextToSpeech 1.2.0 REQUIRED)
find_package (sawRobotIO1394 1.6.0 REQUIRED)
find_package (sawControllers 1.6.0 REQUIRED)

if (sawRobotIO1394_FOUND AND sawControllers_FOUND)

Expand Down Expand Up @@ -74,7 +73,7 @@ if (cisst_FOUND)

# Set the version number
set (sawIntuitiveResearchKit_VERSION_MAJOR "1")
set (sawIntuitiveResearchKit_VERSION_MINOR "5")
set (sawIntuitiveResearchKit_VERSION_MINOR "6")
set (sawIntuitiveResearchKit_VERSION_PATCH "0")
set (sawIntuitiveResearchKit_VERSION "${sawIntuitiveResearchKit_VERSION_MAJOR}.${sawIntuitiveResearchKit_VERSION_MINOR}.${sawIntuitiveResearchKit_VERSION_PATCH}")

Expand Down
2 changes: 1 addition & 1 deletion components/package.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<package>
<name>saw_intuitive_research_kit</name>
<version>1.5.0</version>
<version>1.6.0</version>
<description>
sawIntuitiveResearchKit
</description>
Expand Down
8 changes: 4 additions & 4 deletions examples/deprecated/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ set (REQUIRED_CISST_LIBRARIES cisstCommon
cisstQt)

# find cisst and make sure the required libraries have been compiled
find_package (cisst 1.0.9 REQUIRED ${REQUIRED_CISST_LIBRARIES})
find_package (cisst 1.0.10 REQUIRED ${REQUIRED_CISST_LIBRARIES})

if (cisst_FOUND_AS_REQUIRED)

Expand All @@ -40,9 +40,9 @@ if (cisst_FOUND_AS_REQUIRED)
endif ()

# saw components have been compiled within cisst, we should find them automatically
find_package (sawRobotIO1394 1.5.0 REQUIRED)
find_package (sawControllers 1.5.0 REQUIRED)
find_package (sawIntuitiveResearchKit 1.5.0 REQUIRED)
find_package (sawRobotIO1394 1.6.0 REQUIRED)
find_package (sawControllers 1.6.0 REQUIRED)
find_package (sawIntuitiveResearchKit 1.6.0 REQUIRED)
find_package (sawTextToSpeech REQUIRED)

if (sawRobotIO1394_FOUND AND sawControllers_FOUND
Expand Down
2 changes: 1 addition & 1 deletion examples/deprecated/package.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<package>
<name>saw_intuitive_research_kit_examples_deprecated</name>
<version>1.5.0</version>
<version>1.6.0</version>
<description>
sawIntuitiveResearchKit Examples (deprecated)
</description>
Expand Down
2 changes: 1 addition & 1 deletion examples/derivedTeleOperationPSM/components/package.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<package>
<name>saw_intuitive_research_kit_example_derived_teleop_psm</name>
<version>1.5.0</version>
<version>1.6.0</version>
<description>
sawIntuitiveResearchKit Example
</description>
Expand Down
2 changes: 1 addition & 1 deletion share/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package>
<name>dvrk_config</name>
<version>1.5.0</version>
<version>1.6.0</version>
<description>dVRK config files</description>

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

0 comments on commit c42ad74

Please sign in to comment.