|
Rex Dieter |
f6605c3 |
diff -up marble-15.08.0/CMakeLists.txt.app_versions marble-15.08.0/CMakeLists.txt
|
|
Rex Dieter |
c974d2b |
--- marble-15.08.0/CMakeLists.txt.app_versions 2015-08-12 06:14:02.000000000 -0500
|
|
Rex Dieter |
c974d2b |
+++ marble-15.08.0/CMakeLists.txt 2015-08-30 14:20:32.893896711 -0500
|
|
Rex Dieter |
f6605c3 |
@@ -40,7 +40,8 @@ include( MarbleMacros )
|
|
Rex Dieter |
f6605c3 |
####################################################
|
|
Rex Dieter |
0bdd9fa |
# Generate the tiles with the tilecreator at compile time
|
|
Rex Dieter |
0bdd9fa |
# if this option is set, srtm.jpg will not be installed but the generated tiles instead
|
|
Rex Dieter |
0bdd9fa |
-option(MOBILE "Create a Marble version optimized for handheld devices")
|
|
Rex Dieter |
0bdd9fa |
+option(MOBILE "Create a Marble version optimized for handheld devices" ON)
|
|
Rex Dieter |
0bdd9fa |
+option(TOUCH "Create a Marble version optimized for meego/touch devices" OFF)
|
|
Rex Dieter |
0bdd9fa |
|
|
Rex Dieter |
0bdd9fa |
####################################################
|
|
Rex Dieter |
f6605c3 |
# Specific options for building with Qt 4 vs 5
|
|
Rex Dieter |
f6605c3 |
diff -up marble-15.08.0/data/CMakeLists.txt.app_versions marble-15.08.0/data/CMakeLists.txt
|
|
Rex Dieter |
c974d2b |
--- marble-15.08.0/data/CMakeLists.txt.app_versions 2015-08-12 06:14:02.000000000 -0500
|
|
Rex Dieter |
c974d2b |
+++ marble-15.08.0/data/CMakeLists.txt 2015-08-30 14:20:32.893896711 -0500
|
|
Rex Dieter |
f6605c3 |
@@ -271,11 +271,11 @@ placemarks/boundaryplacemarks.cache
|
|
Rex Dieter |
0bdd9fa |
placemarks/moonterrain.cache
|
|
Rex Dieter |
0bdd9fa |
DESTINATION ${MARBLE_DATA_INSTALL_PATH}/placemarks)
|
|
Rex Dieter |
0bdd9fa |
|
|
Rex Dieter |
0bdd9fa |
-if(MOBILE)
|
|
Rex Dieter |
0bdd9fa |
- install (FILES placemarks/cityplacemarks_large_population.cache DESTINATION ${MARBLE_DATA_INSTALL_PATH}/placemarks RENAME placemarks/cityplacemarks.cache)
|
|
Rex Dieter |
0bdd9fa |
-else(MOBILE)
|
|
Rex Dieter |
0bdd9fa |
+#if(MOBILE)
|
|
Rex Dieter |
0bdd9fa |
+# install (FILES placemarks/cityplacemarks_large_population.cache DESTINATION ${MARBLE_DATA_INSTALL_PATH}/placemarks RENAME placemarks/cityplacemarks.cache)
|
|
Rex Dieter |
0bdd9fa |
+#else(MOBILE)
|
|
Rex Dieter |
0bdd9fa |
install (FILES placemarks/cityplacemarks.cache DESTINATION ${MARBLE_DATA_INSTALL_PATH}/placemarks)
|
|
Rex Dieter |
0bdd9fa |
-endif(MOBILE)
|
|
Rex Dieter |
0bdd9fa |
+#endif(MOBILE)
|
|
Rex Dieter |
0bdd9fa |
|
|
Rex Dieter |
0bdd9fa |
if(NOT APPLE AND NOT WIN32)
|
|
Rex Dieter |
f6605c3 |
install (FILES icons/128-apps-marble.png DESTINATION ${ICON_INSTALL_DIR}/hicolor/128x128/apps/ RENAME marble.png)
|
|
Rex Dieter |
f6605c3 |
diff -up marble-15.08.0/src/apps/CMakeLists.txt.app_versions marble-15.08.0/src/apps/CMakeLists.txt
|
|
Rex Dieter |
c974d2b |
--- marble-15.08.0/src/apps/CMakeLists.txt.app_versions 2015-08-12 06:14:02.000000000 -0500
|
|
Rex Dieter |
c974d2b |
+++ marble-15.08.0/src/apps/CMakeLists.txt 2015-08-30 14:20:53.676049331 -0500
|
|
Rex Dieter |
c974d2b |
@@ -1,11 +1,13 @@
|
|
Rex Dieter |
f6605c3 |
if (NOT ANDROID)
|
|
Rex Dieter |
f6605c3 |
add_subdirectory(marble-ui)
|
|
Rex Dieter |
f6605c3 |
add_subdirectory(marble-qt)
|
|
Rex Dieter |
0bdd9fa |
+if ( MOBILE )
|
|
Rex Dieter |
f6605c3 |
add_subdirectory(marble-mobile)
|
|
Rex Dieter |
f6605c3 |
+endif()
|
|
Rex Dieter |
f6605c3 |
add_subdirectory(marble-kde)
|
|
Rex Dieter |
f6605c3 |
- if( QT_QTDECLARATIVE_FOUND OR Qt5Quick_FOUND )
|
|
Rex Dieter |
f6605c3 |
+ if( TOUCH AND (QT_QTDECLARATIVE_FOUND OR Qt5Quick_FOUND) )
|
|
Rex Dieter |
f6605c3 |
add_subdirectory(marble-touch)
|
|
Rex Dieter |
c974d2b |
- endif( QT_QTDECLARATIVE_FOUND OR Qt5Quick_FOUND )
|
|
Rex Dieter |
c974d2b |
+ endif()
|
|
Rex Dieter |
f6605c3 |
else()
|
|
Rex Dieter |
c974d2b |
add_subdirectory(marble_maps)
|
|
Rex Dieter |
c974d2b |
endif()
|