summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/data
Commit message (Collapse)AuthorAgeFilesLines
* Require cmake package dependencies to have a minimum version as found packageStephen Kelly2013-03-201-0/+5
| | | | | | | | | | | | | | This way find_package(Qt5Svg 5.1.0) will require Qt5Core 5.1.0 or later, for example. Additionally, forward the EXACT keyword to find_package dependencies so that find_package(Qt5Svg 5.1.0 EXACT) will reject Qt5Core 5.2.0, for example. Change-Id: I302f5a3a683e6c36ef42f1e81c5f7e6258cf5624 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix indentation.Stephen Kelly2013-02-221-1/+1
| | | | | Change-Id: I7d5e5549b265507f412c991087ebbec8f6abcc0c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* List the Release library before the Debug library in cmake files.Stephen Kelly2013-02-221-24/+24
| | | | | | | | | | | | | | | | | | | | | | | This way, the Release library is chosen if Qt is configured to build both debug and release, and if the consumer configuration is not an exact match for 'Debug'. This means that RelWithDebInfo and MinSizeRel, which are 'standard' configurations in CMake with mulit-configuration generators, will use the Release version of Qt. All other configurations will also use the Release version, unless MAP_IMPORTED_CONFIG_<CONFIG> is used as described in: http://doc-snapshot.qt-project.org/5.0/qtdoc/cmake-manual.html and in the cmake documentation: http://www.cmake.org/cmake/help/v2.8.10/cmake.html#prop_tgt:MAP_IMPORTED_CONFIG_CONFIG Task-number: QTBUG-29186 Change-Id: Ifc11a9e19fcb304297c204e34a3b25c510329767 Reviewed-by: Brad King <brad.king@kitware.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Create module-specific internal cmake macrosStephen Kelly2013-02-211-9/+9
| | | | | | | | This ensures that invoking the macro from a different module (operating on a different target) is not possible. Change-Id: Idbcd41d03172a8f1dcea26954464ab981fce8879 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Populate the cmake variables only one time.Stephen Kelly2013-02-211-63/+64
| | | | | | | | | | | | Since we're only including the Extras file one time, invoking set() for the include dirs again will overwrite the addition of include dirs in the extras file. We only need to populate these variables if not set anyway, so do that. Change-Id: I04dad0674778e79c8c12c18231b8ce6c92edf881 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* If the libdir is absolute, make the config file non-relocatable.Stephen Kelly2013-02-131-0/+4
| | | | | | | | | If Qt is configured with -libdir /some/dir/outside/the/install/prefix/, then for use absolute paths for the executables and include dirs too. Change-Id: I5ccf62be6f93f97d934df62038fe4cd40dca9a93 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Don't duplicate the 'top-level' include dir in all modules.Stephen Kelly2013-02-091-2/+2
| | | | | | | | | | | | This is the <prefix>/include directory which is independent of the module and which only has to be used once. As everything uses QtCore, it is enough to set it only there. The CI system is a special case, in that it tests things before installation. Handle that case too. Change-Id: Idcdf9617e199b7d490cb3553cce07f1f464b3bec Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Include the CMake Extras file and the Macros file only once.Stephen Kelly2013-02-091-4/+4
| | | | | | | | | | As the Extras file can do things like append to a property (as in QtCore for include directories), that is something that should be done only once when the QtCore target is first defined. Change-Id: I5163912bccfda1ff43a02eb01f67ac59e6f6b24b Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-181-1/+1
| | | | | Change-Id: Ic804938fc352291d011800d21e549c10acac66fb Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix main() signature of headersclean stub fileKai Koehne2012-12-211-1/+1
| | | | | | | Fix MinGW build errors by using the standard main signature. Change-Id: I0ebe7307a825a7ec50e654f163fbf8fe7060a478 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* centralize headersclean testOswald Buddenhagen2012-12-111-0/+55
| | | | | | | | | so other modules can actually re-use the code without referencing qtbase sources. Change-Id: Id66f07b476e539273dd32455e7642a17d7e5d0ef Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* move cmake template files under features/data/Oswald Buddenhagen2012-12-072-0/+201
there will be more template data, and it wouldn't be too nice to spread it all over mkspecs/. Change-Id: I909c48d26ac34f8c0f66051a65d326366d49c096 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 08:00:42 +0000