[kdesdk] use 4.8 branch CMakeLists.txt, this one is busted
Rex Dieter
rdieter at fedoraproject.org
Sun Jun 10 19:23:14 UTC 2012
commit 324bbed061dc57a9c11d8b359a5c391497e86e9f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Sun Jun 10 14:25:49 2012 -0500
use 4.8 branch CMakeLists.txt, this one is busted
CMakeLists.txt | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
kdesdk.spec | 15 +++++---
2 files changed, 121 insertions(+), 5 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..dc2f62a
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,111 @@
+cmake_minimum_required(VERSION 2.6)
+project(kdesdk)
+
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
+
+
+# search packages used by KDE
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+include(MacroLibrary)
+include(CheckIncludeFile)
+include(CheckIncludeFileCXX)
+include(CheckLibraryExists)
+include(CheckCSourceCompiles)
+
+macro_optional_find_package(KdepimLibs)
+
+# The FindKDE4.cmake module sets _KDE4_PLATFORM_DEFINITIONS with
+# definitions like _GNU_SOURCE that are needed on each platform.
+set(CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS} -DQT_STRICT_ITERATORS)
+
+find_package(Strigi REQUIRED)
+
+macro_optional_find_package(LibXslt)
+macro_log_feature(LIBXSLT_FOUND "LibXSLT" "A library to transform XMLfiles into other XML files" "http://xmlsoft.org/XSLT" FALSE "" "Required to build Umbrello.")
+macro_optional_find_package(LibXml2)
+macro_log_feature(LIBXML2_FOUND "LibXML2" "Libraries used to develop XML applications" "http://xmlsoft.org" FALSE "" "Required to build Umbrello.")
+
+set(Boost_MINIMUM_VERSION 1.33.1)
+macro_optional_find_package(Boost)
+macro_log_feature(Boost_FOUND "boost" "Boost C++ Libraries" "http://www.boost.org" FALSE "1.33.1" "Required to build Umbrello.")
+
+macro_optional_find_package(HUNSPELL)
+macro_log_feature(HUNSPELL_FOUND "HUNSPELL" "Library used for stemming" "http://hunspell.sourceforge.net/" FALSE "" "Required to build Lokalize.")
+
+macro_optional_find_package( QCA2 )
+macro_log_feature( QCA2_FOUND "QCA2" "Qt Cryptographic Architecture" "http://delta.affinix.com/qca" FALSE "2.0.0" "Needed for most of the algorithms of the checksum tool in Okteta." )
+
+macro_optional_find_package(LibKonq)
+macro_log_feature(LIBKONQ_FOUND "KDE-Base/LibKonq" "Provides high-level file management functions." "http://dolphin.kde.org/" FALSE "" "Required to build the Dolphin version control plugins.")
+
+add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
+
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIR})
+
+if( UNIX )
+ macro_optional_add_subdirectory(cervisia)
+endif( UNIX )
+if(HUNSPELL_FOUND OR WIN32)
+ macro_optional_add_subdirectory(lokalize)
+endif(HUNSPELL_FOUND OR WIN32)
+
+if(KDEPIMLIBS_FOUND)
+ macro_optional_add_subdirectory(kdeaccounts-plugin)
+endif(KDEPIMLIBS_FOUND)
+
+if(LIBKONQ_FOUND)
+ macro_optional_add_subdirectory(dolphin-plugins/svn)
+ macro_optional_add_subdirectory(dolphin-plugins/git)
+ macro_optional_add_subdirectory(dolphin-plugins/hg)
+ macro_optional_add_subdirectory(dolphin-plugins/bazaar)
+endif(LIBKONQ_FOUND)
+
+# kcachegrind is usable on Windows for XDebug etc.
+macro_optional_add_subdirectory(kcachegrind)
+macro_optional_add_subdirectory(kapptemplate)
+macro_optional_add_subdirectory(kpartloader)
+macro_optional_add_subdirectory(strigi-analyzer)
+macro_optional_add_subdirectory(kioslave)
+macro_optional_add_subdirectory(okteta)
+
+check_c_source_compiles("
+#include <stdlib.h>
+
+int main() {
+#ifndef __GLIBC__
+ choke me
+#endif
+ return 0;
+}" LIBC_IS_GLIBC)
+if (LIBC_IS_GLIBC)
+ macro_optional_add_subdirectory(kmtrace)
+endif ()
+
+macro_optional_add_subdirectory(kompare)
+macro_optional_add_subdirectory(kprofilemethod)
+
+message(STATUS "remember to port kspy to Qt4's metaobjects")
+#add_subdirectory(kspy)
+
+# By default in kde3 kstartpref was not compiled, but well, if it compiles...
+check_include_file(ltdl.h HAVE_LTDL_H)
+if(HAVE_LTDL_H AND NOT APPLE AND NOT WIN32)
+ macro_optional_add_subdirectory(kstartperf)
+endif(HAVE_LTDL_H AND NOT APPLE AND NOT WIN32)
+
+macro_optional_add_subdirectory(kuiviewer)
+message(STATUS "remember to port kunittest")
+#add_subdirectory(kunittest)
+macro_optional_add_subdirectory(poxml)
+message(STATUS "remember to port scheck (check style)")
+#add_subdirectory(scheck)
+macro_optional_add_subdirectory(scripts)
+
+if(LIBXSLT_FOUND AND LIBXML2_FOUND AND Boost_FOUND)
+ macro_optional_add_subdirectory(umbrello)
+endif(LIBXSLT_FOUND AND LIBXML2_FOUND AND Boost_FOUND)
+
+macro_optional_add_subdirectory(doc)
+macro_display_feature_log()
diff --git a/kdesdk.spec b/kdesdk.spec
index 9a2d94a..a53ef9a 100644
--- a/kdesdk.spec
+++ b/kdesdk.spec
@@ -14,8 +14,14 @@ URL: http://www.kde.org/
Source0: ftp://ftp.kde.org/pub/kde/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+## HACK! new cmake-buildsys broken bad, use toplevel CMakeLists.txt from 4.8 branch
+Source1: CMakeLists.txt
+
## upstreamable patches
+# fix build for umbrello docs
Patch50: kdesdk-4.8.90-umbrello_doc.patch
+# fix kstartperf build
+Patch51: kdesdk-4.8.90-kstartperf_pic.patch
## upstream patches
@@ -60,7 +66,7 @@ Requires: %{name}-umbrello = %{version}-%{release}
Requires: kate
%description
-A collection of applications and tools used by developers, including:
+A metapackage/collection of applications and tools used by developers, including:
* cervisia: a CVS frontend
* kate: advanced text editor
* kcachegrind: a browser for data produced by profiling tools (e.g. cachegrind)
@@ -255,6 +261,9 @@ Requires: %{name}-common = %{version}-%{release}
%prep
%setup -q -n kdesdk-%{version}
+mv CMakeLists.txt CMakeLists.txt.orig
+install -m644 %{SOURCE1} .
+
%patch50 -p1 -b .umbrello_doc
@@ -288,10 +297,6 @@ rm -f %{buildroot}%{_kde4_bindir}/krazy-licensecheck
%files
-## leftover pieces
-# kdeaccounts-plugin
-%{_kde4_libdir}/kde4/kabcformat_kdeaccounts.so
-%{_kde4_appsdir}/kabc/formats/kdeaccountsplugin.desktop
%files common
%doc COPYING COPYING.LIB COPYING.DOC README
More information about the scm-commits
mailing list