Benjamin Port
9f13125a6e
Update CMakeLists in order to take in consideration KDE Frameworks target name change.
2013-07-14 18:17:30 +02:00
Sebastian Kügler
0236f2657f
Merge branch 'master' into sebas/kplugins
2013-07-12 10:47:00 +02:00
Sebastian Kügler
ffe01a6b5f
Add KCrash framework
...
Needed to build against latest kdelibs.
2013-07-12 10:46:15 +02:00
Sebastian Kügler
84cd704368
Merge branch 'master' into sebas/kplugins
2013-07-12 10:35:09 +02:00
Alex Neundorf
454bf83be3
-adapt to current changes in kdelibs regarding kde4support: use ${KDE4Support_LIBRARIES} when using it
...
Search for KDE4Support, but after searching KDELibs4, this is hackish, but currentlx necessary due to
cyclic dependencies we still have
Alex
2013-07-11 22:57:04 +02:00
Sebastian Kügler
63212c0fa6
Merge branch 'master' into sebas/kplugins
...
Conflicts:
CMakeLists.txt
2013-07-10 03:55:12 +02:00
Sebastian Kügler
718298fa2c
Fix indentation
2013-07-10 03:54:37 +02:00
Sebastian Kügler
20e67f4db6
Merge branch 'master' into sebas/kplugins
...
Conflicts:
CMakeLists.txt
2013-07-10 03:48:15 +02:00
Sebastian Kügler
dcc5b79aba
Adapt to latest buildsystem changes
2013-07-10 00:12:26 +02:00
Sebastian Kügler
f770f2903c
ktextwidgets is gone
2013-07-10 00:12:26 +02:00
Alex Neundorf
a99fb9d901
-require cmake 2.8.11
...
plasma-frameworks doesn't seem to build with 2.8.10.1:
qt5/include/QtCore/qglobal.h:975:4: error: #error "You must build your code with position independent code if Qt was built with -reduce-relocations. " "Compile your code with -fPIC or -fPIE."
This is most probably related to all the target-property related work from Stephen in CMake 2.8.11.
Alex
2013-07-09 23:12:35 +02:00
Sebastian Kügler
21c04fd3d3
Merge branch 'master' into sebas/kplugins
...
Conflicts:
CMakeLists.txt
2013-07-09 02:34:36 +02:00
Sebastian Kügler
d61e2a44b2
Adapt to latest buildsystem changes
2013-07-09 02:29:57 +02:00
Sebastian Kügler
4fffde0547
ktextwidgets is gone
2013-07-08 01:39:55 +02:00
Sebastian Kügler
1894bec012
Add disabled option to not show warnings
...
When reading the build output, this can help a bit to find the actual
error while porting.
2013-07-08 00:15:37 +02:00
Aleix Pol
b66943c9c5
fix compilation
...
Those components are required by some libraries. It seems to me that
this should be fixed elsewhere, but also it's not acceptable to have
modules that aren't compiling.
2013-07-03 19:19:30 +02:00
Sebastian Kügler
07c17812ca
Merge branch 'master' into plugins
...
Conflicts:
CMakeLists.txt
2013-07-01 04:17:09 +02:00
Sebastian Kügler
dac60f8ab8
Load the time engine and get data out of it.
2013-06-29 05:50:59 +02:00
Ivan Čukić
ef11741bbf
Enabling C++11 flags for clang and gcc
2013-06-29 05:50:59 +02:00
Kevin Ottens
597397b41f
Revert "Enabling C++11 flags for clang and gcc"
...
This reverts commit 7c5e2e49ae
.
In KF5, C++11 is not to be assumed on all our platforms. So don't force
it from cmake. That said we have to make sure our code builds in both
case (C++11 available or not). I'll get in touch with the build.kde.org
admins to sort that out.
CCMAIL: ivan.cukic@kde.org
2013-06-28 10:07:49 +02:00
Kevin Ottens
f9f11653ee
KIconThemes have to come first
2013-06-28 07:54:08 +02:00
Ivan Čukić
7c5e2e49ae
Enabling C++11 flags for clang and gcc
2013-06-23 10:37:36 +02:00
Sebastian Kügler
66e8c5aee8
KWallet has moved out of kdeui
2013-06-21 02:22:42 +02:00
Sebastian Kügler
fae07da91c
Bump required Qt version to a more realistic 5.2.0
2013-06-21 01:38:58 +02:00
Sebastian Kügler
9e6295d6b3
update comment accordingly
2013-06-19 02:53:49 +02:00
Sebastian Kügler
1fa0ab960b
kguiaddons and KDE4_DEFINITIONS are not needed anymore
...
Also add a comment to the KDE4Libs find
2013-06-19 01:15:28 +02:00
Sebastian Kügler
22d261759b
Fix up library finding
...
* Generate and install and include PlasmaTargets.cmake file
* set Plasma_LIBRARIES to KF5::plasma
-> kde-workspace build works for me.
2013-06-13 16:01:06 +02:00
Sebastian Kügler
d492584d39
Clean up macro usage
...
exclusively use the installPackage definition from PlasmaMacros.cmake
2013-06-13 02:19:37 +02:00
Sebastian Kügler
1156d89fce
find package plasma works now
2013-06-13 01:43:35 +02:00
Sebastian Kügler
7ca5c68ddb
Merge branch 'master' into cmake-config
2013-06-13 00:56:55 +02:00
Kevin Ottens
67c901db1a
Turns out order still matters...
2013-05-08 10:08:26 +02:00
Kevin Ottens
3d290decd2
Require XmlGui
2013-05-06 18:01:21 +02:00
Kevin Ottens
27266d5582
New frameworks appeared, update the list
2013-05-04 15:16:31 +02:00
Sebastian Kügler
fde2a1f709
Try a bit saner setup of the cmake foo
...
- Installs PlasmaConfig, FindPlasma, PlasmaMacros, etc.
- find_package Plasma works
- version set to 2.0.0, do we dare that?
This might bump into FindPlasma.cmake, which is installed by kdelibs,
and should be removed: it applies to Plasma 4.1 only and bails out,
since after that, we used the KDE4 libs find_package foo. Now we're kind
of going back to pre-4.2 times. :-)
2013-05-03 03:17:26 +02:00
Sebastian Kügler
0677747fb2
create and install PlasmaConfig.cmake
2013-05-03 01:14:19 +02:00
Sebastian Kügler
cb6fbea574
exclude CMakeLists.txt and .svn from package install
2013-04-27 03:06:58 +02:00
Sebastian Kügler
b679eb6dab
Make installPackage cmake macro useful for other package types
...
Make it possible to install any type into any path prefix. We just add
an optional argument to also specify the type, so from now on installed
service files will not all be plasma-applet-<pluginname>.desktop, but
for example plasma-wallpaper-<pluginname>.desktop.
CCMAIL:plasma-devel@kde.org
2013-04-25 02:08:47 +02:00
Stephen Kelly
bd30cbc43f
Remove some unneeded definitions and includes.
2013-04-12 11:09:43 +02:00
Sebastian Kügler
55952980b5
Move plasmapkg into src
...
It's not really a tool, and really belongs under src.
2013-03-13 02:44:37 +01:00
Marco Martin
f4de55af67
use KAction from kde4support
...
it should buld again, usingkaction as type for kactioncollection
2013-03-04 15:46:47 +01:00
Alex Neundorf
f07a425546
-fix build, find ThreadWeaver via KF5
...
I thin using the variables is safer, this way you are somewhat guarded against changes
in the names of targets, and a typo leads to an empty variable, instead to
"ld: cannot find -lkcoreaddons" which looks very much like a missing normal library
Alex
2013-02-27 21:45:35 +01:00
Alex Neundorf
eaed999665
-port to CamelCase KF5, ecm 0.0.8
...
Alex
2013-02-27 20:06:18 +01:00
Antonis Tsiapaliokas
ff0cab8fa6
Make plasma-framework able to find the include/QtQuick
2013-02-18 18:32:18 +02:00
Sebastian Kügler
7528bbba38
Fixing the typo (leading / before src) is good enough
2013-02-14 21:28:36 +01:00
Sebastian Kügler
f7b4e76e47
Fix include path for CamelCase headers
2013-02-14 21:18:34 +01:00
Marco Martin
7f368317ca
add camelcase include in top level
2013-02-14 20:51:49 +01:00
Sebastian Kügler
14e3446a10
add binarydir/src to includes, for plasma_exports.h
2013-02-14 17:41:49 +01:00
Sebastian Kügler
fe528a6fea
Fix up include dirs
2013-02-14 17:32:41 +01:00
Sebastian Kügler
7dfe957e66
The Big Move
...
All cpp code moves into the src/ subdirectory, as the Frameworks policy
suggests.
Directory structure should now be in line with other, future frameworks.
2013-02-14 17:17:12 +01:00
Sebastian Kügler
51147c9e1a
Enable plasmapkg build
2013-02-13 02:09:00 +01:00
Marco Martin
8d5bb351c7
we require ecm 0.0.7 now
...
having the version number in the installation path may make ecm modules not retrocompatible even when the would be otherwise?
CCMAIL:neundorf@kde.org
2013-02-11 18:21:58 +01:00
Ben Cooksley
5bfba9e4d4
We use X11Extras, so require it.
...
For now KDELibs4/KDELibs4LibraryTargets.cmake demands the presence of KJS, so make sure we drag KJS in.
2013-02-11 11:01:53 +13:00
Alex Neundorf
943a549712
...now also kguiaddons is needed
...
Not sure this is a good way of working... lots of inter-repository updating without version checking :-/
Alex
2013-02-09 14:55:12 +01:00
Alex Neundorf
1d82fffd3d
-now also kauth needs to be found as KF5 component
...
Alex
2013-02-09 11:37:14 +01:00
Alex Neundorf
4f528dcdb3
Load kconfig as a KF5 component (needed by current kdelibs)
...
Alex
2013-02-08 22:33:29 +01:00
Marco Martin
392a8530ef
change add_subdirectory order
2013-02-08 11:29:14 +01:00
Alex Neundorf
c60345f4e5
buildsystem: build always sharted libs, remove WINCE "support"
...
Alex
2013-02-08 01:06:27 +01:00
Alex Neundorf
7b7bed53d7
more buildsystem stuff: add MODULE keywords, don't search Perl and zlib
...
Alex
2013-02-08 01:03:29 +01:00
Alex Neundorf
45a349215e
-no carbon needed here (does plasma care about apple actually ?)
...
Alex
2013-02-08 00:58:17 +01:00
Alex Neundorf
838baa997e
buildsystem cleanup
...
CMAKE_AUTOMOC and CMAKE_LINK_INTERFACE_LIBRARIES are already set by
find_package(KF5 ... CMake)
Empty closing statements.
Alex
2013-02-08 00:56:43 +01:00
Alex Neundorf
2fef398999
Minor buildsystem improvements
...
- use find_package(KF5) to find the tier1 libs
- sort the add_definitions()/remove_definitions() calls a bit
Alex
2013-02-08 00:50:29 +01:00
Alex Neundorf
602f87ac96
buildsystem work: use the new way to use kdelibs frameworks
...
kdelibs frameworks now installs a KDELibs4Config.cmake, which
can be searched more or less normally using
find_package(KDELibs4 NO_MODULE)
Preparing CMAKE_MODULE_PATH is no longer necessary.
KDELibs4Config.cmake does not anymore containg compiler or cmake settings,
so must now load these settings:
find_package(KF5... CMake Compiler)
Alex
2013-02-08 00:06:27 +01:00
Marco Martin
a1f90a3675
name was changed in kdelibs.
...
either way they are renamed it should just be the same
2013-02-07 22:12:28 +01:00
Alex Neundorf
749fef065b
minor build stuff
...
- on my system, the file is name KDeclarativeConfig.cmake, not kdeclarativeConfig.cmake
- no need to include FeatureSummary.cmake twice
Alex
2013-02-07 20:18:04 +01:00
Alex Neundorf
162c5a6b40
port away from old kdelibs cmake stuff
...
- remove usage of old macro_*() macros
- testing for kdelibs_SOURCE_DIR doesn't make sense here, this is only set inside a project(kdelibs)
- don't append a subdir to ${CMAKE_PREFIX_PATH}, this is a list of directories
- don't add ${CMAKE_SOURCE_DIR}/cmake/modules/ to CMAKE_MODULE_PATH, this directory doesn't exist
Alex
2013-02-07 20:12:47 +01:00
Alex Neundorf
cb1296eaa7
-use new kdeqt5staging_INCLUDE_DIRS variable
...
Alex
2013-02-07 20:11:17 +01:00
Marco Martin
6f6b25d37e
add some modules explicitly
...
KDE4Internal still seems needed
2013-02-07 20:09:08 +01:00
Alex Neundorf
2a89688b92
build improvements
...
- add MODULE and NO_MODULE keywords to find_package() to make it obvious what we are looking for
- add kdeqt5staging include dir
- add plasma/includes/ to the includes dirs (why was this missing ?)
Alex
2013-02-07 18:49:15 +01:00
Marco Martin
3d493108ed
go back to KDE4Internal
2013-02-07 18:39:19 +01:00
Marco Martin
edd1366c17
see if it finds KF5Transitional
2013-02-07 18:38:03 +01:00
Marco Martin
c602d21eb0
another attempt
2013-02-07 18:34:47 +01:00
Marco Martin
949a4222cb
search for KF5, use KF5 namespace in linking some stuff
2013-02-07 18:27:34 +01:00
Marco Martin
78b7331238
require kdeqt5staging
2013-02-07 17:23:23 +01:00
Sebastian Kügler
5fa2686272
QCA works with Qt5 -- reenable
2013-02-05 22:17:07 +01:00
Aaron Seigo
3611d138a2
mv the knsrc file in with the plasmapkg binary
...
no knewstuff in the library anymore
2013-02-05 17:32:17 +01:00
Aaron Seigo
475f0a6028
temporarily remove qca2
2013-02-05 16:34:43 +01:00
Marco Martin
78689b3d40
another attempt in setting module paths
2013-02-04 21:37:07 +01:00
Marco Martin
2b45de0e96
try to add CMAKE_PREFIX_PATH to CMAKE_MODULE_PATH
2013-02-04 21:34:04 +01:00
Marco Martin
fef1e3f0e7
use installPackage
2013-02-04 16:48:37 +01:00
Marco Martin
60b37cff34
reenable build of declarative scriptengine
...
just builds, is still pretty broken
2013-02-04 16:10:53 +01:00
Sebastian Kügler
b252fb847e
cmake stuff to enabled the core plugin for porting
2013-02-01 17:03:51 +01:00
Marco Martin
bec0cd4639
move the test shell in shell/
2013-01-31 11:36:37 +01:00
Marco Martin
360cb4a2cb
install the desktop theme
2013-01-31 11:33:51 +01:00
Marco Martin
150b085e9a
remove dead cmake code
2013-01-31 11:33:01 +01:00
Marco Martin
b8662f80cf
plasma correctly builds
2013-01-31 11:30:25 +01:00
Marco Martin
ff49303cbb
port threadweaver usage to installed includes
2013-01-30 17:31:32 +01:00
Marco Martin
80980663c8
enable build of plasma subdir
2013-01-30 14:53:30 +01:00