summaryrefslogtreecommitdiffstats
path: root/src/corelib/Qt5CoreConfigExtras.cmake.in
Commit message (Collapse)AuthorAgeFilesLines
* Make the CONFIG and QT_CONFIG contents available downstream.Stephen Kelly2012-03-021-0/+3
| | | | | | | Change-Id: I62dbc5a695e41179de9f6acd11aa7bc592cac6f3 Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Make the CMake files work with directory overrides.Stephen Kelly2012-02-281-6/+23
| | | | | | | | | | | | 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>
* Add the QtMain windows library to the CMake files.Stephen Kelly2012-02-231-0/+23
| | | | | | | | Change-Id: Iff8b9bdd4b069721103e1cd5854e56b6116d7549 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Add the QT_LIBINFIX to the CMake config files.Stephen Kelly2012-02-221-0/+4
| | | | | | Change-Id: If7bec54eca2d28cba314ce94a1ab1831c024ad31 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Use QMAKE_SUBSTITUTIONS conditionalsStephen Kelly2012-02-221-7/+7
| | | | | | | 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-1/+1
| | | | | | | | 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>
* Only define QT_NAMESPACE if it is used.Stephen Kelly2012-02-171-2/+4
| | | | | | | | Fixes non-namespaced builds. Change-Id: I0ec3c29f58042313dfa864f15c2b2d47914cdedb Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Use ctest to run all tests and print output.Stephen Kelly2012-02-171-4/+2
| | | | | | Change-Id: Ib5a8513cc2d08adce49602b2590059b918b1ffda Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Only define QT_NAMESPACE if it is used.Stephen Kelly2012-02-171-2/+4
| | | | | | | | | Fixes non-namespaced builds. Change-Id: Ie743fc57e7f208fdd50c61b08dc8a4b150de3930 Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Make the cmake tests work with a namespace build.Stephen Kelly2012-02-151-0/+3
| | | | | | | Change-Id: I6858c324548373c57963b5ef137772a1f780ec78 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Add -fPIE to the Qt5Core_COMPILE_FLAGS with reduce-relocations.Stephen Kelly2012-02-101-0/+4
| | | | | | | | | | Qt requires this since 482d96a0c5d523ace63f56bda6851926b4469dd0 Change-Id: Iba783e283b17654abf46f11b81cc1641c3ce7d83 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Add the mkspecs dir to the include dirs.Stephen Kelly2012-02-081-0/+2
| | | | | | | Change-Id: If844785d7d3645c33e0fcb1206cc52f8ab644070 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Remove plugin related variables from the CMake files.Stephen Kelly2011-12-191-4/+0
| | | | | | | | | It doesn't currently have any effect and needs to be re-thought anyway. Change-Id: I6e620ca5b341264bbf5279a19e8f25af8fa7d396 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Add the .exe suffix to executables on Windows.Stephen Kelly2011-12-121-3/+3
| | | | | | Change-Id: I257bb7d62ae18ea529df6b10694fcf25eedc83f4 Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Install CMake config files from Qt.Stephen Kelly2011-11-291-0/+11
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>