From c42ad74910e86228247e4b5450c6bafd297c6114 Mon Sep 17 00:00:00 2001 From: Anton Deguet Date: Wed, 16 May 2018 18:43:48 -0400 Subject: [PATCH] set version to 1.6.0 --- CHANGELOG.md | 2 +- applications/CMakeLists.txt | 8 ++++---- applications/gripper-calibration/CMakeLists.txt | 4 ++-- applications/package.xml | 2 +- components/CMakeLists.txt | 11 +++++------ components/package.xml | 2 +- examples/deprecated/CMakeLists.txt | 8 ++++---- examples/deprecated/package.xml | 2 +- .../derivedTeleOperationPSM/components/package.xml | 2 +- share/package.xml | 2 +- 10 files changed, 21 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2070002..5175f023 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ Change log ========== -1.6.0 (2018-xx-xx) +1.6.0 (2018-05-16) ================== * API changes: diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt index 8fe346d0..17f130a1 100644 --- a/applications/CMakeLists.txt +++ b/applications/CMakeLists.txt @@ -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) @@ -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 diff --git a/applications/gripper-calibration/CMakeLists.txt b/applications/gripper-calibration/CMakeLists.txt index b3b589d5..0f3775ca 100644 --- a/applications/gripper-calibration/CMakeLists.txt +++ b/applications/gripper-calibration/CMakeLists.txt @@ -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) @@ -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) diff --git a/applications/package.xml b/applications/package.xml index a9b3c718..c2dab673 100644 --- a/applications/package.xml +++ b/applications/package.xml @@ -1,6 +1,6 @@ saw_intuitive_research_kit_applications - 1.5.0 + 1.6.0 sawIntuitiveResearchKit Application diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index bb5d74e2..1e0965b1 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt @@ -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) @@ -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) @@ -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}") diff --git a/components/package.xml b/components/package.xml index b5727af6..052ada74 100644 --- a/components/package.xml +++ b/components/package.xml @@ -1,6 +1,6 @@ saw_intuitive_research_kit - 1.5.0 + 1.6.0 sawIntuitiveResearchKit diff --git a/examples/deprecated/CMakeLists.txt b/examples/deprecated/CMakeLists.txt index e1f62313..ca5264e9 100644 --- a/examples/deprecated/CMakeLists.txt +++ b/examples/deprecated/CMakeLists.txt @@ -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) @@ -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 diff --git a/examples/deprecated/package.xml b/examples/deprecated/package.xml index af73f3a8..5e88ab52 100644 --- a/examples/deprecated/package.xml +++ b/examples/deprecated/package.xml @@ -1,6 +1,6 @@ saw_intuitive_research_kit_examples_deprecated - 1.5.0 + 1.6.0 sawIntuitiveResearchKit Examples (deprecated) diff --git a/examples/derivedTeleOperationPSM/components/package.xml b/examples/derivedTeleOperationPSM/components/package.xml index ccff6b88..f57770ef 100644 --- a/examples/derivedTeleOperationPSM/components/package.xml +++ b/examples/derivedTeleOperationPSM/components/package.xml @@ -1,6 +1,6 @@ saw_intuitive_research_kit_example_derived_teleop_psm - 1.5.0 + 1.6.0 sawIntuitiveResearchKit Example diff --git a/share/package.xml b/share/package.xml index 691cb653..f2edb032 100644 --- a/share/package.xml +++ b/share/package.xml @@ -1,7 +1,7 @@ dvrk_config - 1.5.0 + 1.6.0 dVRK config files Anton Deguet