ENH: QtMobility: fixed wrong path to patch file and tar ball, removed unnecessary includes in Libs/Core/CMakeLists.txt

Libs/Core/CMakeLists.txt

@@ -14,7 +14,6 @@ SET(KIT_export_directive "CTK_CORE_EXPORT")
 
 # Additional directories to include
 SET(KIT_include_directories
-  ${QTMOBILITY_INCLUDE_DIRS}
   )
   
 # Source files

SuperBuild.cmake

@@ -213,7 +213,7 @@ IF(${add_project})
   ENDIF()
 
   ExternalProject_Add(${proj}
-    URL ${CTK_BINARY_DIR}/Utilities/QtMobility/qt-mobility-servicefw-opensource-src-1.0.0.tar.gz
+    URL ${CTK_SOURCE_DIR}/Utilities/QtMobility/qt-mobility-servicefw-opensource-src-1.0.0.tar.gz
     PATCH_COMMAND ${CMAKE_COMMAND} -P ${qtmobility_patchscript}
     CONFIGURE_COMMAND <SOURCE_DIR>/configure -${qtmobility_build_type} -libdir ${CMAKE_BINARY_DIR}/CTK-build/bin -no-docs -modules ${qtmobility_modules}
     BUILD_COMMAND ${qtmobility_make_cmd}

Utilities/QtMobility/QtMobility-1.0.0-patch.cmake.in

@@ -14,7 +14,7 @@ SET(configured_patch_dir @qtmobility_configured_patch_dir@)
 SET(QT_BINARY_DIR @QT_BINARY_DIR@)
 
 SET(patch_files
-  QtMobility-1.0.0.patch
+  ${patch_dir}/QtMobility-1.0.0.patch
 )
 
 IF(WIN32)
@@ -52,11 +52,3 @@ IF(UNIX)
   ENDIF()
 ENDIF()
 
-# Let's add the updated files to the local repository. That way, 'git pull'
-# will try to merge the branch changes with the local ones
-execute_process(
-  COMMAND @Git_EXECUTABLE@ add --all
-  WORKING_DIRECTORY ${proj_dir}
-  ERROR_VARIABLE error_output
-  RESULT_VARIABLE error_code
-  )