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

List:       kde-commits
Subject:    [kstars/gsoc2016-kstarslite] kstars: Merge branch 'master' into gsoc2016-kstarslite
From:       Artem Fedoskin <afedoskin3 () gmail ! com>
Date:       2016-07-20 21:23:24
Message-ID: E1bPyxg-0004cq-RS () code ! kde ! org
[Download RAW message or body]

Git commit 4200b2589b5670a2a17f681b0a0724621b1be769 by Artem Fedoskin.
Committed on 01/07/2016 at 20:59.
Pushed by afedoskin into branch 'gsoc2016-kstarslite'.

Merge branch 'master' into gsoc2016-kstarslite

M  +15   -9    kstars/CMakeLists.txt
M  +2    -2    kstars/auxiliary/colorscheme.cpp
M  +2    -2    kstars/auxiliary/fov.cpp
M  +1    -1    kstars/auxiliary/ksuserdb.cpp
M  +5    -5    kstars/dialogs/detaildialog.cpp
M  +2    -2    kstars/indi/drivermanager.cpp
M  +2    -3    kstars/kstarsdata.cpp
M  +17   -21   kstars/kstarsinit.cpp
M  +1    -1    kstars/skycomponents/asteroidscomponent.cpp
M  +1    -1    kstars/skycomponents/cometscomponent.cpp
M  +1    -1    kstars/skycomponents/deepskycomponent.cpp
M  +1    -1    kstars/skycomponents/supernovaecomponent.cpp
M  +2    -1    kstars/skyobjects/satellitegroup.cpp
M  +1    -1    kstars/skyobjects/skyobject.cpp
M  +12   -12   kstars/tools/observinglist.cpp

http://commits.kde.org/kstars/4200b2589b5670a2a17f681b0a0724621b1be769

diff --cc kstars/CMakeLists.txt
index bce1d44,b71ae49..16bc68f
--- a/kstars/CMakeLists.txt
+++ b/kstars/CMakeLists.txt
@@@ -831,14 -647,17 +831,20 @@@ ecm_add_app_icon(KSTARS_APP_SRCS ICON
      ${CMAKE_CURRENT_SOURCE_DIR}/icons/128-apps-kstars.png
  )
  =

 +if(NOT BUILD_KSTARS_LITE)
-     install(TARGETS kstars ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
- =

-     ########### install files ###############
-     install(PROGRAMS org.kde.kstars.desktop DESTINATION ${KDE_INSTALL_APP=
DIR})
-     install(FILES kstars.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
-     install(FILES kstars.knsrc DESTINATION ${KDE_INSTALL_CONFDIR})
-     install(FILES kstarsui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/ksta=
rs)
-     install(FILES fitsviewer.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/ks=
tars)
-     install(FILES kstars.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})
+ qt5_add_resources(KSTARS_APP_SRCS data/kstars.qrc)
+ =

+ add_executable(kstars ${KSTARS_APP_SRCS})
+ target_link_libraries(kstars KStarsLib)
+ =

+ install(TARGETS kstars ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+ =

+ ########### install files ###############
+ install(PROGRAMS org.kde.kstars.desktop DESTINATION ${KDE_INSTALL_APPDIR})
+ install(FILES kstars.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
+ #install(FILES kstars.knsrc DESTINATION ${KDE_INSTALL_CONFDIR})
+ #install(FILES kstarsui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kstars)
+ #install(FILES fitsviewer.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kstar=
s)
+ install(FILES kstars.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})
 +endif(NOT BUILD_KSTARS_LITE)
++>>>>>>> master

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