From 341391606fa0141c5705bff844beb7aa959dda99 Mon Sep 17 00:00:00 2001
From: Manfred Kroehnert <Manfred.Kroehnert@kit.edu>
Date: Mon, 19 Jan 2015 19:56:06 +0100
Subject: [PATCH] use package global Simox version number

---
 CMakeLists.txt                                                  | 2 ++
 source/RobotAPI/applications/HeadIKUnit/CMakeLists.txt          | 2 +-
 .../applications/KinematicUnitSimulation/CMakeLists.txt         | 2 +-
 source/RobotAPI/applications/TCPControlUnit/CMakeLists.txt      | 2 +-
 source/RobotAPI/components/MMMPlayer/CMakeLists.txt             | 2 +-
 source/RobotAPI/components/units/CMakeLists.txt                 | 2 +-
 source/RobotAPI/gui_plugins/HandUnitPlugin/CMakeLists.txt       | 2 +-
 source/RobotAPI/gui_plugins/HapticUnitPlugin/CMakeLists.txt     | 2 +-
 source/RobotAPI/gui_plugins/KinematicUnitPlugin/CMakeLists.txt  | 2 +-
 source/RobotAPI/gui_plugins/PlatformUnitPlugin/CMakeLists.txt   | 2 +-
 .../gui_plugins/SensorActorWidgetsPlugin/CMakeLists.txt         | 2 +-
 source/RobotAPI/libraries/core/CMakeLists.txt                   | 2 +-
 source/RobotAPI/libraries/robotstate/CMakeLists.txt             | 2 +-
 source/RobotAPI/libraries/robotstate/remote/CMakeLists.txt      | 2 +-
 source/RobotAPI/statecharts/operations/CMakeLists.txt           | 2 +-
 15 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e8ca5feb..c821ad1f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,8 @@ include(${ArmarXCore_USE_FILE})
 armarx_project("RobotAPI")
 depends_on_armarx_package(ArmarXGui "OPTIONAL")
 
+set(ArmarX_Simox_VERSION 2.3.6)
+
 add_subdirectory(source)
 
 install_project()
diff --git a/source/RobotAPI/applications/HeadIKUnit/CMakeLists.txt b/source/RobotAPI/applications/HeadIKUnit/CMakeLists.txt
index 7def4d89f..8967cc898 100644
--- a/source/RobotAPI/applications/HeadIKUnit/CMakeLists.txt
+++ b/source/RobotAPI/applications/HeadIKUnit/CMakeLists.txt
@@ -10,7 +10,7 @@ if (Eigen3_FOUND)
 endif()
 
 if (NOT Simox_FOUND)
-    find_package(Simox 2.3.0 QUIET)
+    find_package(Simox ${ArmarX_Simox_VERSION} QUIET)
 endif()
 armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
 include_directories(${Simox_INCLUDE_DIRS})
diff --git a/source/RobotAPI/applications/KinematicUnitSimulation/CMakeLists.txt b/source/RobotAPI/applications/KinematicUnitSimulation/CMakeLists.txt
index 4c74a3e44..48b4f0903 100644
--- a/source/RobotAPI/applications/KinematicUnitSimulation/CMakeLists.txt
+++ b/source/RobotAPI/applications/KinematicUnitSimulation/CMakeLists.txt
@@ -9,7 +9,7 @@ if (Eigen3_FOUND)
 endif()
 
 if (NOT Simox_FOUND)
-    find_package(Simox 2.3.0 QUIET)
+    find_package(Simox ${ArmarX_Simox_VERSION} QUIET)
 endif()
 armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
 include_directories(${Simox_INCLUDE_DIRS})
diff --git a/source/RobotAPI/applications/TCPControlUnit/CMakeLists.txt b/source/RobotAPI/applications/TCPControlUnit/CMakeLists.txt
index 9f18a5c81..d56810c44 100644
--- a/source/RobotAPI/applications/TCPControlUnit/CMakeLists.txt
+++ b/source/RobotAPI/applications/TCPControlUnit/CMakeLists.txt
@@ -10,7 +10,7 @@ if (Eigen3_FOUND)
 endif()
 
 if (NOT Simox_FOUND)
-    find_package(Simox 2.3.0 QUIET)
+    find_package(Simox ${ArmarX_Simox_VERSION} QUIET)
 endif()
 armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
 include_directories(${Simox_INCLUDE_DIRS})
diff --git a/source/RobotAPI/components/MMMPlayer/CMakeLists.txt b/source/RobotAPI/components/MMMPlayer/CMakeLists.txt
index 4d8af688e..f452b59e4 100644
--- a/source/RobotAPI/components/MMMPlayer/CMakeLists.txt
+++ b/source/RobotAPI/components/MMMPlayer/CMakeLists.txt
@@ -7,7 +7,7 @@ if(MMMCore_FOUND)
 endif()
 
 find_package(Eigen3 QUIET)
-find_package(Simox QUIET)
+find_package(Simox ${ArmarX_Simox_VERSION} QUIET)
 
 armarx_build_if(Eigen3_FOUND "Eigen3 not available")
 armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
diff --git a/source/RobotAPI/components/units/CMakeLists.txt b/source/RobotAPI/components/units/CMakeLists.txt
index e7f220a18..91e27f947 100644
--- a/source/RobotAPI/components/units/CMakeLists.txt
+++ b/source/RobotAPI/components/units/CMakeLists.txt
@@ -2,7 +2,7 @@ armarx_set_target("RobotAPI Units Library: RobotAPIUnits")
 
 
 find_package(Eigen3 QUIET)
-find_package(Simox QUIET)
+find_package(Simox ${ArmarX_Simox_VERSION} QUIET)
 
 armarx_build_if(Eigen3_FOUND "Eigen3 not available")
 armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
diff --git a/source/RobotAPI/gui_plugins/HandUnitPlugin/CMakeLists.txt b/source/RobotAPI/gui_plugins/HandUnitPlugin/CMakeLists.txt
index 8c894008a..6bed53b72 100644
--- a/source/RobotAPI/gui_plugins/HandUnitPlugin/CMakeLists.txt
+++ b/source/RobotAPI/gui_plugins/HandUnitPlugin/CMakeLists.txt
@@ -3,7 +3,7 @@ armarx_set_target("HandUnitGuiPlugin")
 find_package(Qt4 COMPONENTS QtCore QtGui QUIET)
 armarx_build_if(QT_FOUND "Qt not available")
 
-find_package(Simox QUIET)
+find_package(Simox ${ArmarX_Simox_VERSION} QUIET)
 #find_package(ArmarXGui QUIET)
 
 armarx_build_if(ArmarXGui_FOUND "ArmarXGui not available")
diff --git a/source/RobotAPI/gui_plugins/HapticUnitPlugin/CMakeLists.txt b/source/RobotAPI/gui_plugins/HapticUnitPlugin/CMakeLists.txt
index 5da1cc4cf..85ec34188 100644
--- a/source/RobotAPI/gui_plugins/HapticUnitPlugin/CMakeLists.txt
+++ b/source/RobotAPI/gui_plugins/HapticUnitPlugin/CMakeLists.txt
@@ -3,7 +3,7 @@ armarx_set_target("HapticUnitUnitGuiPlugin")
 find_package(Qt4 COMPONENTS QtCore QtGui QUIET)
 armarx_build_if(QT_FOUND "Qt not available")
 
-find_package(Simox QUIET)
+find_package(Simox ${ArmarX_Simox_VERSION} QUIET)
 #find_package(ArmarXGui QUIET)
 
 armarx_build_if(ArmarXGui_FOUND "ArmarXGui not available")
diff --git a/source/RobotAPI/gui_plugins/KinematicUnitPlugin/CMakeLists.txt b/source/RobotAPI/gui_plugins/KinematicUnitPlugin/CMakeLists.txt
index f0374fc88..e901507cf 100644
--- a/source/RobotAPI/gui_plugins/KinematicUnitPlugin/CMakeLists.txt
+++ b/source/RobotAPI/gui_plugins/KinematicUnitPlugin/CMakeLists.txt
@@ -5,7 +5,7 @@ find_package(Qt4 COMPONENTS QtCore QtGui QtOpenGL QUIET)
 find_package(Eigen3 QUIET)
 
 # VirtualRobot (adds dependencies to COin3D and SoQt)
-find_package(Simox 2.1.5 QUIET)
+find_package(Simox ${ArmarX_Simox_VERSION} QUIET)
 #find_package(ArmarXGui QUIET)
 
 armarx_build_if(ArmarXGui_FOUND "ArmarXGui not available")
diff --git a/source/RobotAPI/gui_plugins/PlatformUnitPlugin/CMakeLists.txt b/source/RobotAPI/gui_plugins/PlatformUnitPlugin/CMakeLists.txt
index 7dc4de3b2..2e986c3ec 100644
--- a/source/RobotAPI/gui_plugins/PlatformUnitPlugin/CMakeLists.txt
+++ b/source/RobotAPI/gui_plugins/PlatformUnitPlugin/CMakeLists.txt
@@ -3,7 +3,7 @@ armarx_set_target("PlatformUnitGuiPlugin")
 find_package(Qt4 COMPONENTS QtCore QtGui QUIET)
 armarx_build_if(QT_FOUND "Qt not available")
 
-find_package(Simox QUIET)
+find_package(Simox ${ArmarX_Simox_VERSION} QUIET)
 #find_package(ArmarXGui QUIET)
 
 armarx_build_if(ArmarXGui_FOUND "ArmarXGui not available")
diff --git a/source/RobotAPI/gui_plugins/SensorActorWidgetsPlugin/CMakeLists.txt b/source/RobotAPI/gui_plugins/SensorActorWidgetsPlugin/CMakeLists.txt
index 63fc84ec6..ef5fa04ce 100644
--- a/source/RobotAPI/gui_plugins/SensorActorWidgetsPlugin/CMakeLists.txt
+++ b/source/RobotAPI/gui_plugins/SensorActorWidgetsPlugin/CMakeLists.txt
@@ -6,7 +6,7 @@ find_package(qwt QUIET)
 
 find_package(Eigen3 QUIET)
 # VirtualRobot
-find_package(Simox QUIET)
+find_package(Simox ${ArmarX_Simox_VERSION} QUIET)
 #find_package(ArmarXGui QUIET)
 
 armarx_build_if(ArmarXGui_FOUND "ArmarXGui not available")
diff --git a/source/RobotAPI/libraries/core/CMakeLists.txt b/source/RobotAPI/libraries/core/CMakeLists.txt
index 840451b97..d59abb50e 100644
--- a/source/RobotAPI/libraries/core/CMakeLists.txt
+++ b/source/RobotAPI/libraries/core/CMakeLists.txt
@@ -2,7 +2,7 @@ armarx_set_target("RobotAPI Core Library: RobotAPICore")
 
 
 find_package(Eigen3 QUIET)
-find_package(Simox QUIET)
+find_package(Simox ${ArmarX_Simox_VERSION} QUIET)
 
 armarx_build_if(Eigen3_FOUND "Eigen3 not available")
 armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
diff --git a/source/RobotAPI/libraries/robotstate/CMakeLists.txt b/source/RobotAPI/libraries/robotstate/CMakeLists.txt
index e4c185dd8..27b864120 100644
--- a/source/RobotAPI/libraries/robotstate/CMakeLists.txt
+++ b/source/RobotAPI/libraries/robotstate/CMakeLists.txt
@@ -1,7 +1,7 @@
 armarx_set_target("Core Library: ArmarXCoreRobotStateComponent")
 
 find_package(Eigen3 QUIET)
-find_package(Simox 2.3.0 QUIET)
+find_package(Simox ${ArmarX_Simox_VERSION} QUIET)
 
 armarx_build_if(Eigen3_FOUND "Eigen3 not available")
 armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
diff --git a/source/RobotAPI/libraries/robotstate/remote/CMakeLists.txt b/source/RobotAPI/libraries/robotstate/remote/CMakeLists.txt
index 149001100..f49a6b357 100644
--- a/source/RobotAPI/libraries/robotstate/remote/CMakeLists.txt
+++ b/source/RobotAPI/libraries/robotstate/remote/CMakeLists.txt
@@ -2,7 +2,7 @@
 armarx_set_target("Core Library: RobotAPIRemoteRobot")
 find_package(Eigen3 QUIET)
 if (NOT Simox_FOUND)
-    find_package(Simox 2.3.0 QUIET)
+    find_package(Simox ${ArmarX_Simox_VERSION} QUIET)
 endif()
 
 armarx_build_if(Eigen3_FOUND "Eigen3 not available")
diff --git a/source/RobotAPI/statecharts/operations/CMakeLists.txt b/source/RobotAPI/statecharts/operations/CMakeLists.txt
index 3c2cce08c..82eaea4f7 100644
--- a/source/RobotAPI/statecharts/operations/CMakeLists.txt
+++ b/source/RobotAPI/statecharts/operations/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 armarx_set_target("Core Library: RobotAPIOperations")
 find_package(Eigen3 QUIET)
-find_package(Simox 2.3.0 QUIET)
+find_package(Simox ${ArmarX_Simox_VERSION} QUIET)
 
 armarx_build_if(Eigen3_FOUND "Eigen3 not available")
 armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
-- 
GitLab