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

List:       kde-commits
Subject:    [kdelibs/frameworks] /: Move KCrash to tier2
From:       Martin Klapetek <mklapetek () kde ! org>
Date:       2013-09-04 10:00:55
Message-ID: E1VH9tP-0004z5-0n () scm ! kde ! org
[Download RAW message or body]

Git commit 16964ce920f96cee53fdfcb380d1a6d48b649832 by Martin Klapetek.
Committed on 04/09/2013 at 10:00.
Pushed by mklapetek into branch 'frameworks'.

Move KCrash to tier2

REVIEW: 112495

M  +0    -1    staging/CMakeLists.txt
M  +1    -0    tier2/CMakeLists.txt
R  +4    -16   tier2/kcrash/CMakeLists.txt [from: staging/kcrash/CMakeLists=
.txt - 075% similarity]
R  +2    -0    tier2/kcrash/KCrashConfig.cmake.in [from: staging/kcrash/KCr=
ashConfig.cmake.in - 087% similarity]
R  +1    -1    tier2/kcrash/src/CMakeLists.txt [from: staging/kcrash/src/CM=
akeLists.txt - 095% similarity]
R  +0    -0    tier2/kcrash/src/config-kcrash.h.cmake [from: staging/kcrash=
/src/config-kcrash.h.cmake - 100% similarity]
R  +0    -0    tier2/kcrash/src/config-strlcpy.h.cmake [from: staging/kcras=
h/src/config-strlcpy.h.cmake - 100% similarity]
R  +0    -0    tier2/kcrash/src/kcrash.cpp [from: staging/kcrash/src/kcrash=
.cpp - 100% similarity]
R  +0    -0    tier2/kcrash/src/kcrash.h [from: staging/kcrash/src/kcrash.h=
 - 100% similarity]
R  +0    -0    tier2/kcrash/src/strlcpy-fake.c [from: staging/kcrash/src/st=
rlcpy-fake.c - 100% similarity]

http://commits.kde.org/kdelibs/16964ce920f96cee53fdfcb380d1a6d48b649832

diff --git a/staging/CMakeLists.txt b/staging/CMakeLists.txt
index 3e4ec3a..f8ce1cc 100644
--- a/staging/CMakeLists.txt
+++ b/staging/CMakeLists.txt
@@ -12,7 +12,6 @@ add_subdirectory(xmlgui)
 add_subdirectory(kwallet)
 add_subdirectory(ki18n) # must be before kwidgets, etc.
 add_subdirectory(kservice)
-add_subdirectory(kcrash)
 add_subdirectory(kio)
 add_subdirectory(frameworkintegration)
 =

diff --git a/tier2/CMakeLists.txt b/tier2/CMakeLists.txt
index bd5ea8c..1f110e8 100644
--- a/tier2/CMakeLists.txt
+++ b/tier2/CMakeLists.txt
@@ -3,3 +3,4 @@ project(tier2)
 find_package(KF5 5.0.0 REQUIRED MODULE COMPONENTS CMake Compiler InstallDi=
rs)
 =

 add_subdirectory(kauth)
+add_subdirectory(kcrash)
diff --git a/staging/kcrash/CMakeLists.txt b/tier2/kcrash/CMakeLists.txt
similarity index 75%
rename from staging/kcrash/CMakeLists.txt
rename to tier2/kcrash/CMakeLists.txt
index ce926ec..05c058c 100644
--- a/staging/kcrash/CMakeLists.txt
+++ b/tier2/kcrash/CMakeLists.txt
@@ -2,31 +2,19 @@ cmake_minimum_required(VERSION 2.8.11)
 =

 project(KCrash)
 =

+find_package(ECM 0.0.8 REQUIRED NO_MODULE)
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 =

-if(NOT kdelibs_SOURCE_DIR)
-
-  find_package(ECM 0.0.8 REQUIRED NO_MODULE)
-
-  set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
-
-  find_package(Qt5 5.2.0 REQUIRED NO_MODULE COMPONENTS Widgets)
-
-  find_package(KF5 5.0.0 REQUIRED MODULE COMPONENTS CMake Compiler Install=
Dirs KCoreAddons KWindowSystem)
-
-endif()
+find_package(Qt5 5.2.0 REQUIRED NO_MODULE COMPONENTS Gui Widgets)
+find_package(KF5 5.0.0 REQUIRED MODULE COMPONENTS CMake Compiler InstallDi=
rs KCoreAddons KWindowSystem)
 =

 include(FeatureSummary)
-
 include(ECMSetupVersion)
 =

 ecm_setup_version(5 0 0 VARIABLE_PREFIX KCrash
                         VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kcrash=
_version.h"
                         PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/=
KCrashConfigVersion.cmake")
 =

-remove_definitions(-DQT_NO_CAST_TO_ASCII)
-remove_definitions(-DQT_NO_CAST_FROM_ASCII)
-remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
-
 add_subdirectory(src)
 =

 # create a Config.cmake and a ConfigVersion.cmake file and install them
diff --git a/staging/kcrash/KCrashConfig.cmake.in b/tier2/kcrash/KCrashConf=
ig.cmake.in
similarity index 87%
rename from staging/kcrash/KCrashConfig.cmake.in
rename to tier2/kcrash/KCrashConfig.cmake.in
index d8126be..41caa30 100644
--- a/staging/kcrash/KCrashConfig.cmake.in
+++ b/tier2/kcrash/KCrashConfig.cmake.in
@@ -2,6 +2,8 @@
 =

 # Any changes in this file will be overwritten by CMake.
 =

+find_dependency(Qt5Gui @REQUIRED_QT_VERSION@)
+
 set(KCrash_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@")
 set_and_check(KCrash_INCLUDE_DIR    "@PACKAGE_INCLUDE_INSTALL_DIR@")
 =

diff --git a/staging/kcrash/src/CMakeLists.txt b/tier2/kcrash/src/CMakeList=
s.txt
similarity index 95%
rename from staging/kcrash/src/CMakeLists.txt
rename to tier2/kcrash/src/CMakeLists.txt
index 5dab9be..b04c6d3 100644
--- a/staging/kcrash/src/CMakeLists.txt
+++ b/tier2/kcrash/src/CMakeLists.txt
@@ -24,7 +24,7 @@ configure_file(
 add_library(KCrash ${kcrash_SRCS})
 generate_export_header(KCrash)
 =

-target_link_libraries(KCrash LINK_PUBLIC Qt5::Core)
+target_link_libraries(KCrash LINK_PUBLIC Qt5::Core Qt5::Gui)
 target_link_libraries(KCrash LINK_PRIVATE ${KCoreAddons_LIBRARIES} ${KWind=
owSystem_LIBRARIES} )
 =

 =

diff --git a/staging/kcrash/src/config-kcrash.h.cmake b/tier2/kcrash/src/co=
nfig-kcrash.h.cmake
similarity index 100%
rename from staging/kcrash/src/config-kcrash.h.cmake
rename to tier2/kcrash/src/config-kcrash.h.cmake
diff --git a/staging/kcrash/src/config-strlcpy.h.cmake b/tier2/kcrash/src/c=
onfig-strlcpy.h.cmake
similarity index 100%
rename from staging/kcrash/src/config-strlcpy.h.cmake
rename to tier2/kcrash/src/config-strlcpy.h.cmake
diff --git a/staging/kcrash/src/kcrash.cpp b/tier2/kcrash/src/kcrash.cpp
similarity index 100%
rename from staging/kcrash/src/kcrash.cpp
rename to tier2/kcrash/src/kcrash.cpp
diff --git a/staging/kcrash/src/kcrash.h b/tier2/kcrash/src/kcrash.h
similarity index 100%
rename from staging/kcrash/src/kcrash.h
rename to tier2/kcrash/src/kcrash.h
diff --git a/staging/kcrash/src/strlcpy-fake.c b/tier2/kcrash/src/strlcpy-f=
ake.c
similarity index 100%
rename from staging/kcrash/src/strlcpy-fake.c
rename to tier2/kcrash/src/strlcpy-fake.c
[prev in list] [next in list] [prev in thread] [next in thread]