summaryrefslogtreecommitdiffstats
path: root/mkspecs/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Overwrite the LIB_DEPENDENCIES of modules.Stephen Kelly2012-03-311-2/+2
| | | | | | | | | This way if a module is found more than once, the list does not grow duplicates. Change-Id: I08e3e2a83453f45a49fe79e803a4b50d115709a3 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Ensure that the variable for the installation prefix is unique.Stephen Kelly2012-03-311-6/+6
| | | | | | | | | Using the same variable for multiple config files can lead to conflicts. Change-Id: Ie6a22618c4c2e64567874e5c7e8b278e067fedae Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Prefix the variables for debug and release types properly.Stephen Kelly2012-03-281-2/+2
| | | | | Change-Id: I346992effa997f60a4fd20055f0af81d6a084095 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* List the dependencies of Qt when creating static libraries.Stephen Kelly2012-03-051-2/+53
| | | | | | Change-Id: Ib6787f982ff962cfdf3d8a0a26989489619a57b0 Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Make the CMake files work with directory overrides.Stephen Kelly2012-02-281-5/+22
| | | | | | | | | | | | This allows us to create correct CMake config files when Qt is configured with directories outside of the prefix (which Qt allows), and also allows us to use correct values when a 'longer' relative lib directory is used such as lib/x86_64-linux-gnu. Change-Id: I6f88255a23752dc5b84cb20ce13fdeeee9d5ad51 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Use QMAKE_SUBSTITUTIONS conditionalsStephen Kelly2012-02-221-38/+38
| | | | | | | Instead of generating CMake conditionals. Change-Id: I3d987cc08666270e618222be9292558e73bc961e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Give the compile flags an EXECUTABLE_ prefix.Stephen Kelly2012-02-211-0/+4
| | | | | | | | The fPIE flag should only be used with executables. Change-Id: If799ae4a7fe2492af3aac67651659a52d365024a Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Make modules find their own dependencies.Stephen Kelly2012-01-111-0/+12
| | | | | | Change-Id: I4a7b96d33417a15d79f3932ced91bee58915c83f Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix cmake files for static builds.Stephen Kelly2011-12-231-1/+5
| | | | | | Change-Id: I3864017df6fc0daeb31b389c8883401d344730bf Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Include the extras files after defining the target.Stephen Kelly2011-12-191-8/+8
| | | | | | | | Allows the extras file to contain references to the target. Change-Id: I47332c4efcb7ba0132509a41fa3040531cd1c81f Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Use plural form for CMake variables.Stephen Kelly2011-12-061-2/+1
| | | | | Change-Id: Idc0cd360e09046a5746c9f7366c7fd4b982058fe Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove CMake variables which are not needed in Config files.Stephen Kelly2011-12-061-5/+1
| | | | | | Change-Id: I8f6795f1d40983af0478270f33ab1c06abe67133 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Quote the path in CMake so that spaces in paths work.Stephen Kelly2011-12-031-1/+1
| | | | | | Change-Id: Ie73a4b242ab0bf90e6f292be9a7b7913ae4273a5 Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Richard J. Moore <rich@kde.org>
* Make the Qt5 part of the target name namespace style.Stephen Kelly2011-12-021-9/+9
| | | | | | | | As it was in Qt4 and discussed on the cmake list. Change-Id: Ide77c2525a261a5d658d7cb661010a67d3386341 Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Install CMake config files from Qt.Stephen Kelly2011-11-292-0/+73
This includes a BSD licenced file Qt5CoreMacros.cmake which is adapted from Qt4Macros.cmake in the CMake source tree. Change-Id: I54326b808795535490a0489659b351a8da72cdbb Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>