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

List:       kde-commits
Subject:    [bomber] /: Format.
From:       Frederik Schwarzer <schwarzerf () gmail ! com>
Date:       2016-01-27 13:01:54
Message-ID: E1aOPjO-0003ei-U8 () scm ! kde ! org
[Download RAW message or body]

Git commit c131f96a05e5ffb946ef8abf96f6317d285f5177 by Frederik Schwarzer.
Committed on 27/01/2016 at 13:01.
Pushed by schwarzer into branch 'master'.

Format.

M  +17   -16   CMakeLists.txt
M  +6    -6    src/CMakeLists.txt

http://commits.kde.org/bomber/c131f96a05e5ffb946ef8abf96f6317d285f5177

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8fa32d0..204ee58 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,15 +7,15 @@ set (KF5_MIN_VERSION "5.15.0")
 find_package(ECM 1.8.0 REQUIRED CONFIG)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MO=
DULE_DIR})
 =

-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets )
-find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS =

-    CoreAddons
+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets)
+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     Config
+    CoreAddons
     Crash
     DBusAddons
+    DocTools
     I18n
     XmlGui
-    DocTools
 )
 =

 find_package(KF5KDEGames 4.9.0 REQUIRED)
@@ -30,19 +30,20 @@ include(KDECompilerSettings)
 include(KDECMakeSettings)
 include(ECMAddAppIcon)
 =

-add_definitions(-DQT_USE_FAST_CONCATENATION
-                -DQT_USE_FAST_OPERATOR_PLUS
-                -DQT_NO_CAST_FROM_ASCII
-                -DQT_NO_CAST_TO_ASCII
-                -DQT_NO_CAST_FROM_BYTEARRAY
-                -DQT_NO_URL_CAST_FROM_STRING
-                -DQT_USE_QSTRINGBUILDER
+add_definitions(
+    -DQT_USE_FAST_CONCATENATION
+    -DQT_USE_FAST_OPERATOR_PLUS
+    -DQT_NO_CAST_FROM_ASCII
+    -DQT_NO_CAST_TO_ASCII
+    -DQT_NO_CAST_FROM_BYTEARRAY
+    -DQT_NO_URL_CAST_FROM_STRING
+    -DQT_USE_QSTRINGBUILDER
 )
 =

-add_subdirectory( themes ) =

-add_subdirectory( sounds )
-add_subdirectory( pictures )
-add_subdirectory( src )
-add_subdirectory( doc )
+add_subdirectory(themes)
+add_subdirectory(sounds)
+add_subdirectory(pictures)
+add_subdirectory(src)
+add_subdirectory(doc)
 =

 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_=
PACKAGES)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0ee8478..2fbfedb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,7 +11,7 @@ set(bomber_SRCS
    explodable.cpp
  )
 =

-kconfig_add_kcfg_files(bomber_SRCS settings.kcfgc )
+kconfig_add_kcfg_files(bomber_SRCS settings.kcfgc)
 file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../pictures/*-apps-bombe=
r.png")
 ecm_add_app_icon(bomber_SRCS ICONS ${ICONS_SRCS})
 add_executable(bomber ${bomber_SRCS})
@@ -25,12 +25,12 @@ target_link_libraries(bomber
     KF5::Crash
 )
 =

-install(TARGETS bomber ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS bomber ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 =

 =

 ########### install files ###############
 =

-install( PROGRAMS org.kde.bomber.desktop  DESTINATION  ${KDE_INSTALL_APPDI=
R} )
-install( FILES org.kde.bomber.appdata.xml DESTINATION  ${CMAKE_INSTALL_MET=
AINFODIR} )
-install( FILES bomber.kcfg  DESTINATION  ${KDE_INSTALL_KCFGDIR} )
-install( FILES bomberui.rc  DESTINATION  ${KDE_INSTALL_KXMLGUI5DIR}/bomber=
 )
+install(PROGRAMS org.kde.bomber.desktop  DESTINATION  ${KDE_INSTALL_APPDIR=
})
+install(FILES org.kde.bomber.appdata.xml DESTINATION  ${CMAKE_INSTALL_META=
INFODIR})
+install(FILES bomber.kcfg  DESTINATION  ${KDE_INSTALL_KCFGDIR})
+install(FILES bomberui.rc  DESTINATION  ${KDE_INSTALL_KXMLGUI5DIR}/bomber)
[prev in list] [next in list] [prev in thread] [next in thread]