Merge remote-tracking branch 'upstream/master' into tutorial

Author: jessdtate

src/CMakeLists.txt

@@ -750,7 +750,6 @@ SET_PROPERTY(TARGET Core_Logging         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_ConsoleApplication         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_CommandLine         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_Command         PROPERTY FOLDER "Core")
-SET_PROPERTY(TARGET Core_SystemCall         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_Thread         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_ImportExport         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_IEPlugin         PROPERTY FOLDER "Core")
@@ -759,8 +758,6 @@ SET_PROPERTY(TARGET Core_Application         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_Application_Preferences         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_Application_Session         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_Utils         PROPERTY FOLDER "Core")
-SET_PROPERTY(TARGET Core_ICom         PROPERTY FOLDER "Core")
-SET_PROPERTY(TARGET Core_Services         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_Math         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_Matlab         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_Parser         PROPERTY FOLDER "Core")

src/Core/CMakeLists.txt

@@ -45,10 +45,7 @@ ADD_SUBDIRECTORY(Matlab)
 ADD_SUBDIRECTORY(Persistent)
 ADD_SUBDIRECTORY(Utils)
 ADD_SUBDIRECTORY(Thread)
-ADD_SUBDIRECTORY(Services)
-ADD_SUBDIRECTORY(ICom)
 ADD_SUBDIRECTORY(Parser)
-ADD_SUBDIRECTORY(SystemCall)
 ADD_SUBDIRECTORY(XMLUtil)
 
 IF(BUILD_WITH_PYTHON)