Merge branch 'master' into FixForWerror

CMakeLists.txt

@@ -15,15 +15,20 @@ armarx_project("RobotAPI")
 depends_on_armarx_package(ArmarXGui "OPTIONAL")
 
 set(ArmarX_Simox_VERSION 2.3.36)
+option(REQUIRE_SIMOX "If enabled the Simox dependency is a required dependency" TRUE)
 
-find_package(Simox ${ArmarX_Simox_VERSION} QUIET)
+if(REQUIRE_SIMOX)
+    find_package(Simox ${ArmarX_Simox_VERSION} REQUIRED)
+else()
+    find_package(Simox ${ArmarX_Simox_VERSION} QUIET)
+endif()
 if (Simox_FOUND)
 	setupSimoxExternalLibraries()
 endif()
 
 add_subdirectory(source)
 
-list(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS "simox")
+list(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS "simox (>= ${ArmarX_Simox_VERSION})")
 
 install_project()
 

source/RobotAPI/statecharts/WeissHapticGroup/WeissHapticGroup.scgxml

 <?xml version="1.0" encoding="utf-8"?>
 <StatechartGroup name="WeissHapticGroup" package="RobotAPI" generateContext="true">
 	<Proxies>
-		<Proxy value="RobotAPICore.hapticObserver"/>
-		<Proxy value="RobotAPICore.weissHapticUnit"/>
+		<Proxy value="RobotAPIInterfaces.hapticObserver"/>
+		<Proxy value="RobotAPIInterfaces.weissHapticUnit"/>
 	</Proxies>
 	<State filename="WeissHapticSensorTest.xml" visibility="public"/>
 </StatechartGroup>