[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/base/marble
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2007-03-24 16:51:53
Message-ID: 1174755113.926235.28054.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 646118 by chehrlic:

made some paths more win32 like

 M  +16 -8     data/CMakeLists.txt  
 M  +13 -8     src/CMakeLists.txt  
 M  +2 -0      src/katlasdirs.h  


--- trunk/playground/base/marble/data/CMakeLists.txt #646117:646118
@@ -1,3 +1,11 @@
+
+if(WIN32)
+  set(data_dir ${CMAKE_INSTALL_PREFIX}/data)
+else(WIN32)
+  set(data_dir ${data_dir})
+endif(WIN32)
+
+
 install (FILES
 bitmaps/city_1_orange.png
 bitmaps/city_1_red.png
@@ -27,11 +35,11 @@
 bitmaps/pole_1.png
 bitmaps/pole_2.png
 bitmaps/volcano_1.png
-DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/marble/data/bitmaps)
+DESTINATION ${data_dir}/bitmaps)
 
 install (FILES 
 svg/windrose.svg
-DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/marble/data/svg)
+DESTINATION ${data_dir}/svg)
 
 install (FILES 
 flags/flag_ad.svg
@@ -277,25 +285,25 @@
 flags/flag_za.svg
 flags/flag_zm.svg
 flags/flag_zw.svg
-DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/marble/data/flags)
+DESTINATION ${data_dir}/flags)
 
 install (FILES
 maps/citylights/citylights.jpg
 maps/citylights/citylights.dgml
 maps/citylights/citylights-preview.png
-DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/marble/data/maps/citylights)
+DESTINATION ${data_dir}/maps/citylights)
 
 install (FILES
 maps/etopo2/etopo.jpg
 maps/etopo2/etopo2.dgml
 maps/etopo2/etopo-preview.png
-DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/marble/data/maps/etopo2)
+DESTINATION ${data_dir}/maps/etopo2)
 
 install (FILES
 maps/bluemarble/bluemarble.jpg
 maps/bluemarble/bluemarble.dgml
 maps/bluemarble/bluemarble-preview.png
-DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/marble/data/maps/bluemarble)
+DESTINATION ${data_dir}/maps/bluemarble)
 
 install (FILES
 mwdbii/PDIFFBORDER.PNT
@@ -310,11 +318,11 @@
 mwdbii/PAUST.PNT
 mwdbii/PBORDER.PNT
 mwdbii/PMEXICO.PNT
-DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/marble/data/mwdbii)
+DESTINATION ${data_dir}/mwdbii)
 
 install (FILES
 placemarks/baseplacemarks.cache
 placemarks/cityplacemarks.cache
 placemarks/elevplacemarks.cache
-DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/marble/data/placemarks)
+DESTINATION ${data_dir}/placemarks)
 
--- trunk/playground/base/marble/src/CMakeLists.txt #646117:646118
@@ -60,6 +60,7 @@
 )
 
 set(marble_HDRS
+           katlasdirs.h
            katlascontrol.h
            katlasview.h
            katlasviewinputhandler.h
@@ -125,13 +126,17 @@
 	target_link_libraries (marble ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} \
${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} ${QT_QTNETWORK_LIBRARY} \
${KDE4_KDECORE_LIBRARY})  endif (QTONLY)
 
-#set_target_properties(marble PROPERTIES VERSION 1.0.0 SOVERSION 1)
-install (TARGETS marble DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
-#install (TARGETS marble DESTINATION ${LIB_INSTALL_DIR} )
+if(WIN32)
+    install (TARGETS marble DESTINATION ${CMAKE_INSTALL_PREFIX} )
+else(WIN32)
+    #set_target_properties(marble PROPERTIES VERSION 1.0.0 SOVERSION 1)
+    install (TARGETS marble DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
+    #install (TARGETS marble DESTINATION ${LIB_INSTALL_DIR} )
 
-if (NOT QTONLY)
-install( FILES marble.desktop  DESTINATION ${XDG_APPS_DIR})
-else (NOT QTONLY)
-install( FILES marble.desktop  DESTINATION \
                ${CMAKE_INSTALL_PREFIX}/share/applications)
-endif (NOT QTONLY)
+    if (NOT QTONLY)
+    install( FILES marble.desktop  DESTINATION ${XDG_APPS_DIR})
+    else (NOT QTONLY)
+    install( FILES marble.desktop  DESTINATION \
${CMAKE_INSTALL_PREFIX}/share/applications) +    endif (NOT QTONLY)
+endif(WIN32)
 
--- trunk/playground/base/marble/src/katlasdirs.h #646117:646118
@@ -27,6 +27,8 @@
           return QDir( qApp->applicationDirPath() 
 #if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || defined(Q_OS_UNIX)
 	+ QLatin1String("/../share/apps/marble/data")
+#elif defined(Q_OS_WIN)
+    + QLatin1String("/data")
 #endif
 	  ).canonicalPath();
         }


[prev in list] [next in list] [prev in thread] [next in thread]