Blob Blame History Raw
diff -up marble-4.12.0/CMakeLists.txt.app_versions marble-4.12.0/CMakeLists.txt
--- marble-4.12.0/CMakeLists.txt.app_versions	2013-12-11 14:55:59.000000000 -0500
+++ marble-4.12.0/CMakeLists.txt	2013-12-24 10:33:37.496698469 -0500
@@ -26,7 +26,8 @@ include( MarbleMacros )
 # Generate the tiles with the tilecreator at compile time
 # if this option is set, srtm.jpg will not be installed but the generated tiles instead
 option(QTONLY "Create Marble version without KDE dependencies" OFF)
-option(MOBILE "Create a Marble version optimized for handheld devices")
+option(MOBILE "Create a Marble version optimized for handheld devices" ON)
+option(TOUCH  "Create a Marble version optimized for meego/touch devices" OFF)
 
 ####################################################
 # Specific options for if building with Qt or kde4 libs
diff -up marble-4.12.0/src/apps/CMakeLists.txt.app_versions marble-4.12.0/src/apps/CMakeLists.txt
--- marble-4.12.0/src/apps/CMakeLists.txt.app_versions	2013-12-11 14:55:59.000000000 -0500
+++ marble-4.12.0/src/apps/CMakeLists.txt	2013-12-24 10:29:27.472965499 -0500
@@ -1,11 +1,15 @@
 add_subdirectory(marble-ui)
 add_subdirectory(marble-qt)
+if ( MOBILE )
 add_subdirectory(marble-mobile)
+endif ( MOBILE )
 
 if (NOT QTONLY)
   add_subdirectory(marble-kde)
 endif()
 
+if( TOUCH )
 if( QT_QTDECLARATIVE_FOUND OR Qt5Quick_FOUND )
     add_subdirectory(marble-touch)
 endif( QT_QTDECLARATIVE_FOUND OR Qt5Quick_FOUND )
+endif( TOUCH )