ENH: Added QtMobility superbuild

Libs/Core/CMakeLists.txt

@@ -1,5 +1,27 @@
 PROJECT(CTKCore)
 
+# use the QtMobility SuperBuild paths for now
+# we should add a FindQtMobility later
+SET(QTMOBILITY_INCLUDE_DIRS 
+  "${CTK_BINARY_DIR}/../CMakeExternals/Source/QtMobility/install/include"
+  )
+SET(QTMOBILITY_LIBRARY_DIR "${LIBRARY_OUTPUT_PATH}")
+FIND_LIBRARY(QTMOBILITY_QTSERVICEFW_LIBRARY_DEBUG QtServiceFrameworkd
+             PATHS ${QTMOBILITY_LIBRARY_DIR}
+             )
+             
+FIND_LIBRARY(QTMOBILITY_QTSERVICEFW_LIBRARY_RELEASE QtServiceFramework
+             PATHS ${QTMOBILITY_LIBRARY_DIR}
+             )
+             
+SET(QTMOBILITY_QTSERVICEFW_LIBRARY )
+IF(QTMOBILITY_QTSERVICEFW_LIBRARY_RELEASE)
+  LIST(APPEND QTMOBILITY_QTSERVICEFW_LIBRARY optimized ${QTMOBILITY_QTSERVICEFW_LIBRARY_RELEASE})
+ENDIF()
+IF(QTMOBILITY_QTSERVICEFW_LIBRARY_DEBUG)
+  LIST(APPEND QTMOBILITY_QTSERVICEFW_LIBRARY debug ${QTMOBILITY_QTSERVICEFW_LIBRARY_DEBUG})
+ENDIF()
+             
 #
 # See CTK/CMake/ctkMacroBuildQtLib.cmake for details
 #
@@ -8,6 +30,7 @@ SET(KIT_export_directive "Q_CTK_CORE_EXPORT")
 
 # Additional directories to include
 SET(KIT_include_directories
+  ${QTMOBILITY_INCLUDE_DIRS}
   )
   
 # Source files

Libs/Core/Testing/CMakeLists.txt

@@ -11,7 +11,7 @@ REMOVE (TestsToRun ${KIT}CxxTests.cxx)
 SET(LIBRARY_NAME ${PROJECT_NAME})
 
 ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
-TARGET_LINK_LIBRARIES(${KIT}CxxTests ${LIBRARY_NAME})
+TARGET_LINK_LIBRARIES(${KIT}CxxTests ${LIBRARY_NAME} ${CTK_BASE_LIBRARIES})
 
 SET( KIT_TESTS ${CXX_TEST_PATH}/${KIT}CxxTests)
 IF(WIN32)

Libs/Core/target_libraries.cmake

@@ -6,4 +6,5 @@
 
 SET(target_libraries
   ${QT_LIBRARIES}
+  ${QTMOBILITY_QTSERVICEFW_LIBRARY}
   )

SuperBuild.cmake

@@ -119,6 +119,33 @@ ExternalProject_Add(${proj}
     )
 
 #-----------------------------------------------------------------------------
+# QtMobility
+#
+SET(qtmobility_modules "serviceframework")
+SET(qtmobility_build_type "release")
+IF(UNIX)
+  IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    SET(qtmobility_build_type "debug")
+  ENDIF()
+ELSEIF(NOT ${CMAKE_CFG_INTDIR} STREQUAL "Release")
+  SET(qtmobility_build_type "debug")
+ENDIf()
+
+SET(qtmobility_patchcmd )
+IF(UNIX)
+  SET(qtmobility_patchcmd patch -p0 < ${CTK_SOURCE_DIR}/Utilities/QtMobility/QtMobilityBeta1-Linux.patch)
+ENDIF(UNIX)
+
+SET(proj QtMobility)
+ExternalProject_Add(${proj}
+    URL "http://get.qt.nokia.com/qt/solutions/qt-mobility-src-1.0.0-beta1.tar.gz"
+    CONFIGURE_COMMAND <SOURCE_DIR>/configure -${qtmobility_build_type} -libdir ${CMAKE_BINARY_DIR}/CTK-build/bin -no-docs -modules ${qtmobility_modules}
+    PATCH_COMMAND ${qtmobility_patchcmd}
+    BUILD_IN_SOURCE 1
+    )
+    
+
+#-----------------------------------------------------------------------------
 # Utilities/OpenIGTLink
 #
 SET(proj OpenIGTLink)
@@ -161,6 +188,7 @@ ExternalProject_Add(${proj}
     "ZMQ"
     "OpenIGTLink"
 #     "XIP"
+    "QtMobility"
 )
 
 #-----------------------------------------------------------------------------

Utilities/QtMobility/QtMobilityBeta1-Linux.patch

@@ -0,0 +1,13 @@
+*** common.pri	2010-02-12 07:12:31.000000000 +0100
+--- common-n.pri	2010-03-10 20:52:32.000000000 +0100
+***************
+*** 104,109 ****
+--- 104,111 ----
+      QMAKE_RPATHDIR += $$OUTPUT_DIR/lib
+  }
+  
++ contains(TEMPLATE,.*lib):DEFINES += QT_SHARED
++ 
+  maemo6 {
+      DEFINES+= Q_WS_MAEMO_6
+  }