Commit graph

84 commits

Author SHA1 Message Date
Ivailo Monev
2182d5dc47 use string builder and fix issues with it on UNIX
upstream commits:
ad9b37a706
8a8fca2f85

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-06-12 14:21:03 +00:00
Ivailo Monev
0afe0c0c36 simplify installation directories handling via use of CPACK_SET_DESTDIR
also, the CMake files are installed where they can be found by default
(without any manual configuration) by default - in the top-level
installation directory (CMAKE_INSTALL_PREFIX)

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-06-10 14:06:44 +03:00
Ivailo Monev
40d182dc74 warn about QT_PLUGIN_PATH when tests are going to be run
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-06-08 18:04:53 +00:00
Ivailo Monev
4e078c3e50 add QT_STRICT_ITERATORS to possible future build definitions
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-05-29 15:00:09 +00:00
Ivailo Monev
d8b2b2fe42 fix warnings about undefined pre-processor definitions
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-05-24 13:13:19 +00:00
Ivailo Monev
df8a6ad916 move OpenGL conditional where it belongs
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-05-08 16:13:36 +00:00
Ivailo Monev
803e2710c6 make configuration paths cached
that makes them overridable even from external projects (which can be bad
since it can make translations be installed in the wrong path) but for
those who build Katie itself it would be easier to change the paths from
the CMake GUI or their IDE

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-05-03 17:00:51 +00:00
Ivailo Monev
5de582be65 make the setup of KATIE_COMPONENTS and KATIE_TOOLS dynamic
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-05-03 16:02:00 +00:00
Ivailo Monev
a34c3f8f9f install ld config regardless of RPATH preferences
some vendors may just change/remove the RPATH with external tool,
such as chrpath or scanelf, even tought there is a CMake option
for it

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-05-03 13:57:39 +00:00
Ivailo Monev
29d0375f1d change the way configuration directories are handled
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-04-26 02:43:35 +00:00
Ivailo Monev
24aa5769e2 add alias header for QtTestGui
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-04-25 17:43:15 +00:00
Ivailo Monev
c9f839a82c oops, add .h extension to header alias
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-04-19 13:03:20 +00:00
Ivailo Monev
a3c4a687b4 deal with some obsolete headers
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-04-19 11:47:06 +00:00
Ivailo Monev
ca66bdf7a3 more obsolete headers werk
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-04-18 14:51:46 +00:00
Ivailo Monev
d40fb722c4 generate compat event headers
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-04-18 12:07:12 +00:00
Ivailo Monev
70ce287de9 disable automatic UIC invocation too
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-04-18 10:34:49 +00:00
Ivailo Monev
6d34300180 improve Qt4 compatibility
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-04-18 10:23:04 +00:00
Ivailo Monev
32ad8fbaa9 improve Qt4 compatibility
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-04-18 08:51:25 +00:00
Ivailo Monev
42fa915cd9 improve Qt4 compatibility
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-04-18 08:17:40 +00:00
Ivailo Monev
21aa484251 fix one alias header
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-03-17 05:25:40 +00:00
Ivailo Monev
e4ec23f0f0 remove Phonon and the VLC backend for it
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-03-14 22:06:32 +00:00
Ivailo Monev
61cb795736 Merge branch 'master' of https://github.com/fluxer/katie 2016-03-09 19:45:15 +02:00
Ivailo Monev
00dfcccb1a when building on Windows natively create NSIS package
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-03-09 19:45:08 +02:00
Ivailo Monev
f8585337cc move package feature definitions to top-level CMake file
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-03-09 17:24:04 +00:00
Ivailo Monev
7daccd499e set package directory to just Katie (without version) 2016-03-08 03:02:09 +02:00
Ivailo Monev
8ef8b9a9f0 fix descriptions of some packages
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-03-07 16:59:56 +00:00
Ivailo Monev
7645100282 make threads optional
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-03-07 16:55:29 +00:00
Ivailo Monev
88d8ab14b6 merge conflicts
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-03-02 05:43:17 +02:00
Ivailo Monev
b7e90a6269 initial QPA/QWS platform drop, lots of cleanups to follow
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-03-02 05:41:40 +02:00
Ivailo Monev
0e7de5d972 fix package target for Windows platform
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-02-29 18:31:07 +02:00
Ivailo Monev
864c9d57a0 build system cleanups
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-02-29 04:56:55 +02:00
Ivailo Monev
1cc954fad3 misc cleanups
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-02-22 20:26:58 +02:00
Ivailo Monev
a69c0d99d8 add shells profile file to workaround musl dynamic loader issue
this file guarantees that on hardened musl libc systems the
libraries can be found by the libraries loader when build without
RPATH and the custom ld config is not respected. it does require
a logout to take effect but I do not know what else can be done
about that.

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-02-14 01:26:40 +02:00
Ivailo Monev
9c6a136318 require X11, if not bootstrapping
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-02-13 20:19:31 +02:00
Ivailo Monev
2cbc2de226 request Xt X11 component
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-02-13 20:08:52 +02:00
Ivailo Monev
f402e532a2 use camel case name as the CMake project name
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-02-10 00:44:10 +02:00
Ivailo Monev
1469d2f65b remove CMake platform target properties entirely
they cause different (troublesome) behaviour depending on wheather the
build is performed on Windows or UNIX host

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-02-05 21:16:35 +02:00
Ivailo Monev
51d4f42bd2 prioratize CMake target properties
this fixes an issue where running executables build with MinGW on Windows
host does nothing and the final executable is useless

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-02-05 17:50:09 +02:00
Ivailo Monev
770b645637 use miniz when zlib is not available
since the compression is required for the network component, rcc and other
cruft a minimal zlib replacement should do just fine for that purpose.

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-02-05 18:17:58 +02:00
Ivailo Monev
15fd52a278 deal with some obsolete headers
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-02-01 20:21:48 +02:00
Ivailo Monev
da068392bf build system cleanups
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-02-01 15:26:26 +02:00
Ivailo Monev
22a57da665 make CPack aware of the README file
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-29 23:19:23 +02:00
Ivailo Monev
8378b13b08 add generate utility
just for refence, the concurrent code has been hand-edited

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-28 02:28:29 +02:00
Ivailo Monev
63d964e345 remove cotire support
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-28 01:43:36 +02:00
Ivailo Monev
288426c544 add inline assembly checks to build system
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-27 15:19:03 +02:00
Ivailo Monev
73901d10b0 minor cleanups
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-27 14:50:22 +02:00
Ivailo Monev
90f13f0196 use custom module for Freetype2 detection
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-27 14:45:16 +02:00
Ivailo Monev
2fe6525ad4 set version in qglobal header during configuration
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-27 14:10:40 +02:00
Ivailo Monev
456ab36732 remove PulseAudio support from Phonon and its backend
it should not be up to Phonon to support PulseAudio (or ALSA in
that matter) separately, the real backend (in this case VLC)
should decide what to use and the Phonon backend should offer
only offer control over that with some sort of configuration.

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-22 22:49:12 +02:00
Ivailo Monev
54182dc078 rewrite VLC CMake module
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2016-01-22 14:30:12 +02:00