summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/data
Commit message (Collapse)AuthorAgeFilesLines
* CMake: Ensure that the EXECUTABLE_COMPILE_FLAGS list existsStephen Kelly2013-10-241-3/+3
| | | | | | | This is needed to ensure that list(REMOVE_DUPLICATES) can work. Change-Id: I3d992aa244fcdfbda7e3b48ce416e0ba5ffcde96 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Set PRIVATE includes variable to empty, not undefined.Stephen Kelly2013-10-241-5/+5
| | | | | | | This is necessary so that list(REMOVE_DUPLICATES) works properly. Change-Id: Id268637d76b1a8785c9ff0c6e09e9ad8a62bbfb6 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Generate source includes in a separate file, if needed.Stephen Kelly2013-10-162-6/+8
| | | | | | | | | | | | The source includes shouldn't be used by installations, so don't install the extra file, but only use it if the package is used from the build-dir. Task-number: QTBUG-33970 Change-Id: I08f91b8a716e935cb04d1233d44cf5c092e240ce Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Sergio Ahumada2013-09-101-1/+9
|\ | | | | | | refs/staging/dev
| * Fix usr-move workaround in the presence of multi-arch.Stephen Kelly2013-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cmake directory may not be $PREFIX/lib/cmake, but instead $PREFIX/lib/<arch>/cmake. Getting the PATH of such a directory will not lead us to $PREFIX/, but to $PREFIX/lib. Use a relative calculation instead. Task-number: QTBUG-33223 Change-Id: Ice4e0f859ab1df238bad4eb942f073e84dd86cc3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * Add source directories to include paths if needed.Stephen Kelly2013-09-051-0/+8
| | | | | | | | | | | | | | | | Task-number: QTBUG-33145 Change-Id: I555064cd92691459222463df9917f8222e31323b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Teach CMake about Qt 5 plugins.Stephen Kelly2013-09-102-0/+33
|/ | | | | Change-Id: Idd3225759f9f5ec620f79e29035eb176f965bef7 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Populate INTERFACE_LINK_LIBRARIES property in the cmake files.Stephen Kelly2013-08-211-1/+3
| | | | | | | | This is new in CMake 2.8.12 and replaces the old properties matching IMPORTED_INTERFACE_LINK_LIBRARIES_<CONFIG>. Change-Id: I5d4c454972f2535f6792e95718c73d80c56ac24c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Use absolute path in the /usr move workaround if -libdir is specifiedStephen Kelly2013-07-241-0/+4
| | | | | | Change-Id: I68d087b15839418008db5bf1c0c76ca303245519 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* CMake: Remove copy-pasto for the IMPORTED_LOCATIONStephen Kelly2013-07-241-1/+1
| | | | | | | | Task-number: QTBUG-32579 Change-Id: Ibe9dd92824091989168fca842a59b556937b1f08 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Don't check for the existence of private include directories.Stephen Kelly2013-07-221-5/+12
| | | | | | | | | | | Some packagers don't want to install the private headers. Check the existence of private headers only if the 'Private' component is specified when finding the package. Task-number: QTBUG-32466 Change-Id: I1fdbfb25e8ce485cd051564b937f766b2733741a Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Android Windows: Adjust to new SDK layoutRay Donnelly2013-07-041-15/+15
| | | | | | | | | | | | | Google moved dx.bat into a new build-tools/VERSION folder meaning our dx.bat no longer found dx.jar. Fix this by passing into our dx.bat, the location of the real dx.bat Removed hardcoded 17.0.0 and %ANDROID_BUILD_TOOLS_REVISION% path searches. Change-Id: I91c12c01745d6f12edbd126102b8f06eba291402 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Add path to the headers in frameworks to the include dirs.Stephen Kelly2013-07-031-0/+15
| | | | | | | Task-number: QTBUG-32134 Change-Id: I30a2db3363d995ecb6e2b06c66080f7430174868 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Hardcode the VERSION reported by qmake instead of calculating it in cmake.Stephen Kelly2013-07-031-5/+5
| | | | | Change-Id: Ia83f995a64a56c845bbce1a90702a98fc83a1401 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Adjust the cmake files to find the dlls in the bin dir.Stephen Kelly2013-06-151-23/+31
| | | | | | Change-Id: I840f963c3648d123b31f79aa2c8902c0ad74e982 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Don't test existence of private header directories for mac frameworksStephen Kelly2013-06-101-1/+5
| | | | | | | | | | | These directories are not currently part of the Qt installation for mac frameworks. Task-number: QTBUG-31641 Change-Id: Ifef372cc2ebb692f9ae5a7b1f8dba5f683d1e7eb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Android: Fix Windows build with recent SDKEskil Abrahamsen Blomfeldt2013-05-311-0/+6
| | | | | | | | | | | Since the dx tool has moved in the SDK, we need to update our copy of it to also search in the new location for dx.jar. Task-number: QTBUG-31405 Change-Id: If093a9f51f33c5d8666919f516a3b336322a7169 Reviewed-by: Ray Donnelly <mingw.android@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Check that files we expect to find actually exist when using a cmake package.Stephen Kelly2013-05-201-8/+35
| | | | | | Change-Id: If7c724daa85df5e29e410b8deb4e69beb43ee8ea Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Only generate entries for private include dirs if they exist.Stephen Kelly2013-05-141-0/+8
| | | | | | Change-Id: I1d745adfbae371f8f1f76e954be98f4c2fd962e0 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Handle usr-move without forcing absolute pathsStephen Kelly2013-04-191-1/+15
| | | | | | | | | | | | | | | | | | In qtbase commit 7ac58d1ff0815566ba1de09519299b5119e5ee91 (Make cmake packages installed to /usr non-relocatable., 2013-02-11), we made cmake config files non-relocatable if they were installed to the /usr prefix. That was assumed to mean that this was a distro or platform package, and was a workaround for the usr-move problem on Fedora and ArchLinux. However, cmake bug http://public.kitware.com/Bug/view.php?id=14041 showed that forcing absolute paths in this situation is not desirable in cross compiling scenarios. CMake commit 6c613b433c45efb0bb013a6bd668cbb8ac740259 (Handle usr-move without forcing absolute paths (#14041), 2013-04-03) addressed the problem in CMake, and this commit is an equivalent. Change-Id: I065a6230bc618aa980fae6ca511ae10df4cd62c2 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Minimize the contents of the INTERFACE_INCLUDE_DIRECTORIESStephen Kelly2013-04-111-4/+5
| | | | | | | | | | | The property only needs to contain the direct include dirs of a target. For example, Qt5::Gui does not need to contain the include/QtCore directory because it already has Qt5::Core in its LINK_INTERFACE_LIBRARIES. Change-Id: I69612f42c29e6056b3d15399498d041d43a0dd6b Reviewed-by: Brad King <brad.king@kitware.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Don't redundantly define cmake package *_VERSION variablesStephen Kelly2013-04-051-3/+1
| | | | | | | | These variables are set by the ConfigVersion.cmake file already, so no need to maintain them manually in the Config file too. Change-Id: I73d949fb22052f4f6acbc1f70518e73f8fbf7c9c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Look for cmake package dependents only in the parent directory.Stephen Kelly2013-04-051-1/+1
| | | | | | | | | | Fedora uses configure options to set the install prefix to a location which does not contain the cmake config files. Rather than finding dependencies from the installation prefix, find them in sibling directories instead. Change-Id: I06974e9655d0dda2a18064d0f9a33997cf2cb2d3 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix pathing problem with our dx.batRay Donnelly2013-04-051-1/+1
| | | | | | | Need to look in <android-sdk>/platform-tools/lib for dx.jar Change-Id: I104cf157ce1795e907cca31b37c62163248b8d77 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Android: Enable the java feature on Windows.Ray Donnelly2013-04-031-0/+102
| | | | | | | | | | | | | There is a bug in dx.bat in the Google Android SDK tool where relative paths do not work correctly. We need to use our own version of this tool until: https://android-review.googlesource.com/#/c/52680/ ..is merged. Change-Id: I451a3239590919d014a673f3e8e17244e96676ab Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Populate includes, defines and pic flags in target interfaces.Stephen Kelly2013-03-271-0/+5
| | | | | | | | | | | | | | | Used by features in CMake 2.8.11. This matches the features in FindQt4 in that version of CMake, namely that the IMPORTED targets contain the appropriate INTERFACE_INCLUDE_DIRECTORIES and INTERFACE_COMPILE_DEFINITIONS and that the qtmain.lib static library is automatically linked to on Windows by executables. Additionally, the INTERFACE_POSITION_INDEPENDENT_CODE property is set appropriately if Qt requires users to use position independent code. Change-Id: Ide341f43fcaf7d722a7bdf1a12b1071c7e548ccc Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Revert "Don't duplicate the 'top-level' include dir in all modules."Stephen Kelly2013-03-261-2/+2
| | | | | | | | | | | | | This will likely fix some odd cmake related tests in the CI. This reverts commit 316d8ececa3314ec16baf46ec4f1c5440cd951ef. Conflicts: mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in src/corelib/Qt5CoreConfigExtras.cmake.in Change-Id: Ib7714746f96bf12061d92242a42296d200c56c00 Reviewed-by: David Faure (KDE) <faure@kde.org>
* 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-05-19 09:10:38 +0000