Merge branch 'stable'

source/RobotAPI/gui-plugins/HandUnitPlugin/CMakeLists.txt

@@ -12,9 +12,9 @@ armarx_build_if(Simox_FOUND "Simox not available")
 
 include(${QT_USE_FILE})
 
-file(GLOB SOURCES HandUnitGuiPlugin.cpp
+set(SOURCES HandUnitGuiPlugin.cpp
      HandUnitConfigDialog.cpp)
-file(GLOB HEADERS HandUnitGuiPlugin.h
+set(HEADERS HandUnitGuiPlugin.h
      HandUnitConfigDialog.h)
 
 set(GUI_MOC_HDRS

source/RobotAPI/gui-plugins/HapticUnitPlugin/CMakeLists.txt

@@ -15,14 +15,14 @@ include_directories(${Eigen3_INCLUDE_DIR})
 
 include(${QT_USE_FILE})
 
-file(GLOB SOURCES
+set(SOURCES
     HapticUnitGuiPlugin.cpp
     HapticUnitConfigDialog.cpp
     MatrixDisplayWidget.cpp
     MatrixDatafieldDisplayWidget.cpp
 )
 
-file(GLOB HEADERS
+set(HEADERS
     HapticUnitGuiPlugin.h
     HapticUnitConfigDialog.h
     MatrixDisplayWidget.h

source/RobotAPI/gui-plugins/PlatformUnitPlugin/CMakeLists.txt

@@ -12,9 +12,9 @@ armarx_build_if(Simox_FOUND "Simox not available")
 
 include(${QT_USE_FILE})
 
-file(GLOB SOURCES PlatformUnitGuiPlugin.cpp
+set(SOURCES PlatformUnitGuiPlugin.cpp
      PlatformUnitConfigDialog.cpp)
-file(GLOB HEADERS PlatformUnitGuiPlugin.h
+set(HEADERS PlatformUnitGuiPlugin.h
      PlatformUnitConfigDialog.h)
 
 set(GUI_MOC_HDRS