diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt index 2dd2d12c..cfccfbab 100644 --- a/applications/CMakeLists.txt +++ b/applications/CMakeLists.txt @@ -1,5 +1,5 @@ # -# (C) Copyright 2009-2020 Johns Hopkins University (JHU), All Rights Reserved. +# (C) Copyright 2009-2021 Johns Hopkins University (JHU), All Rights Reserved. # # --- begin cisst license - do not edit --- # @@ -36,7 +36,7 @@ set (REQUIRED_CISST_LIBRARIES cisstCommon cisstQt) # find cisst and make sure the required libraries have been compiled -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) @@ -50,10 +50,10 @@ if (cisst_FOUND_AS_REQUIRED) endif () # saw components have been compiled within cisst, we should find them automatically - find_package (sawRobotIO1394 1.7.0 REQUIRED) - find_package (sawControllers 1.7.0 REQUIRED) - find_package (sawIntuitiveResearchKit 1.7.1 REQUIRED) - find_package (sawTextToSpeech 1.2.0 REQUIRED) + find_package (sawRobotIO1394 2.0.0 REQUIRED) + find_package (sawControllers 2.0.0 REQUIRED) + find_package (sawIntuitiveResearchKit 2.0.0 REQUIRED) + find_package (sawTextToSpeech 1.3.0 REQUIRED) if (sawRobotIO1394_FOUND AND sawControllers_FOUND AND sawIntuitiveResearchKit_FOUND AND sawTextToSpeech_FOUND) diff --git a/applications/gripper-calibration/CMakeLists.txt b/applications/gripper-calibration/CMakeLists.txt index 551d4db6..b4848c9a 100644 --- a/applications/gripper-calibration/CMakeLists.txt +++ b/applications/gripper-calibration/CMakeLists.txt @@ -1,5 +1,5 @@ # -# (C) Copyright 2009-2017 Johns Hopkins University (JHU), All Rights Reserved. +# (C) Copyright 2009-2021 Johns Hopkins University (JHU), All Rights Reserved. # # --- begin cisst license - do not edit --- # @@ -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.11 REQUIRED ${REQUIRED_CISST_LIBRARIES}) +find_package (cisst 1.1.0 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.7.0 REQUIRED) + find_package (sawRobotIO1394 2.0.0 REQUIRED) if (sawRobotIO1394_FOUND) diff --git a/applications/package.xml b/applications/package.xml index bc1fc305..1baaca9c 100644 --- a/applications/package.xml +++ b/applications/package.xml @@ -1,6 +1,6 @@ saw_intuitive_research_kit_applications - 1.7.1 + 2.0.0 sawIntuitiveResearchKit Application diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index a12a41fe..c62bbf69 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt @@ -1,5 +1,5 @@ # -# (C) Copyright 2011-2019 Johns Hopkins University (JHU), All Rights Reserved. +# (C) Copyright 2011-2021 Johns Hopkins University (JHU), All Rights Reserved. # # --- begin cisst license - do not edit --- # @@ -27,7 +27,7 @@ set (REQUIRED_CISST_LIBRARIES cisstRobot cisstNumerical) -find_package (cisst 1.0.11 REQUIRED ${REQUIRED_CISST_LIBRARIES}) +find_package (cisst 1.1.0 REQUIRED ${REQUIRED_CISST_LIBRARIES}) if (cisst_FOUND) @@ -43,9 +43,9 @@ if (cisst_FOUND) endif () # saw components have been compiled within cisst, we should find them automatically - find_package (sawTextToSpeech 1.2.0 REQUIRED) - find_package (sawRobotIO1394 1.7.0 REQUIRED) - find_package (sawControllers 1.7.0 REQUIRED) + find_package (sawTextToSpeech 1.3.0 REQUIRED) + find_package (sawRobotIO1394 2.0.0 REQUIRED) + find_package (sawControllers 2.0.0 REQUIRED) if (sawRobotIO1394_FOUND AND sawControllers_FOUND) @@ -76,9 +76,9 @@ if (cisst_FOUND) set (sawIntuitiveResearchKit_LIBRARIES sawIntuitiveResearchKit) # Set the version number - set (sawIntuitiveResearchKit_VERSION_MAJOR "1") - set (sawIntuitiveResearchKit_VERSION_MINOR "7") - set (sawIntuitiveResearchKit_VERSION_PATCH "1") + set (sawIntuitiveResearchKit_VERSION_MAJOR "2") + set (sawIntuitiveResearchKit_VERSION_MINOR "0") + set (sawIntuitiveResearchKit_VERSION_PATCH "0") set (sawIntuitiveResearchKit_VERSION "${sawIntuitiveResearchKit_VERSION_MAJOR}.${sawIntuitiveResearchKit_VERSION_MINOR}.${sawIntuitiveResearchKit_VERSION_PATCH}") # Generate sawIntuitiveResearchKitRevision.h diff --git a/components/package.xml b/components/package.xml index 1ad78ae4..643bd694 100644 --- a/components/package.xml +++ b/components/package.xml @@ -1,6 +1,6 @@ saw_intuitive_research_kit - 1.7.1 + 2.0.0 sawIntuitiveResearchKit diff --git a/examples/derivedTeleOperationPSM/components/CMakeLists.txt b/examples/derivedTeleOperationPSM/components/CMakeLists.txt index b531bf03..014eb9e0 100644 --- a/examples/derivedTeleOperationPSM/components/CMakeLists.txt +++ b/examples/derivedTeleOperationPSM/components/CMakeLists.txt @@ -40,7 +40,7 @@ if (cisst_FOUND) # sawIntuitiveResearchKit has been compiled within cisst, we should # find it automatically - find_package(sawIntuitiveResearchKit 1.7.1 REQUIRED) + find_package(sawIntuitiveResearchKit 2.0.0 REQUIRED) if (sawIntuitiveResearchKit_FOUND) diff --git a/examples/derivedTeleOperationPSM/components/package.xml b/examples/derivedTeleOperationPSM/components/package.xml index 50089376..330e625b 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.7.1 + 2.0.0 sawIntuitiveResearchKit Example diff --git a/share/package.xml b/share/package.xml index 5dfa9611..85fe581b 100644 --- a/share/package.xml +++ b/share/package.xml @@ -1,7 +1,7 @@ dvrk_config - 1.7.1 + 2.0.0 dVRK config files Anton Deguet diff --git a/tests/package.xml b/tests/package.xml index 84c44b94..b05c3baf 100644 --- a/tests/package.xml +++ b/tests/package.xml @@ -1,6 +1,6 @@ saw_intuitive_research_kit_tests - 1.7.1 + 2.0.0 sawIntuitiveResearchKit Tests