summaryrefslogtreecommitdiffstats
path: root/tests/auto/cmake/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* Add a variable for the private includes for modules.Stephen Kelly2012-06-231-0/+1
| | | | | | | This is required to use QPA for example in 5.0. Change-Id: I44bfc6987d778370e55c05c591f63ff84c482d0a Reviewed-by: David Faure <faure@kde.org>
* Give the CMake unit tests more meaningful names.Stephen Kelly2012-06-231-27/+36
| | | | | Change-Id: I0a54d32ec62ff6daf7672d0aabdeb038f4c7c78f Reviewed-by: David Faure <faure@kde.org>
* Forward-port change to QT4_ADD_RESOURCES macro for missing rcc files.Stephen Kelly2012-06-231-0/+1
| | | | | | | | Forward-port of commit 9ce67d30011db4528d3d0bbee36412e13cfb80cc in cmake.git. Change-Id: I2d6c14f68f1630fc0835b3103e5058f52c2d0d13 Reviewed-by: David Faure <faure@kde.org>
* Use IF(NOT TARGET ...) before creating imported targets.Stephen Kelly2012-05-151-0/+1
| | | | | | | | | | | | | | | | | | Initially we didn't do this because someone could accidentally create another target of a conflicting name, and used a variable to store whether we have created the target already or not. That wasn't adequeate to deal with finding the package in a scope like a function, so we used a directory property. However, the directory property is not valid in the same scopes as the defined target. For example, finding a Qt module in both a directory and a subdirectory causes a conflict. As it is already unlikely that a target would be accidentally created with a name like Qt5::Core, we should simply use the IF(TARGET) form. Change-Id: If64f25d45f51edcd1edb0d4bfb5ed3bb2479bd27 Reviewed-by: David Faure <faure@kde.org>
* Make the qt5_use_modules public API.Stephen Kelly2012-05-101-3/+3
| | | | | | | | | | | | | | This cmake function handles all of the necessary logic for using the include directories of Qt modules, linking to Qt modules, adding the required definitions, and most importantly, adding the position independent flags required on UNIX systems to use Qt by default. The function relies on functionality available in CMake 2.8.8, so it is only available if that version of CMake or greater is used. Change-Id: Ibe698e06819129479348c240844264c41553b5fb Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Revert "Don't use the pri depends line for link dependencies."Stephen Kelly2012-05-031-2/+1
| | | | | | | | | | | | | This reverts commit df43b9a06a73759ba74f23d9c3e91bd0347d1026. Using the same depends information as QMake provides adds a lot of convenience for users, and is mostly 'correct' from a CMake point of view anyway. Change-Id: I8f2a2f74a687c25a0dedcc491ef72ddb5b136090 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Never attempt to run the dbus tests on APPLE.Stephen Kelly2012-05-011-1/+1
| | | | | | | | | | | | | The Qt buildsystem is creating the config files for it even when it is not building QtDBus, so Qt5DBus_FOUND = True. Re-enable the CI testing on mac with this change. Task-number: QTBUG-25522 Change-Id: I5d2690d17fde6c5aabcbdd3e2eef9f0846edd97d Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Simplify the cmake version check.Stephen Kelly2012-04-291-1/+1
| | | | | | Change-Id: Ifdd89397f88b090a6b43d40636dbeac029faaed8 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Add some more useful output when about the cmake versionStephen Kelly2012-04-291-1/+1
| | | | | | Change-Id: I58efa1f295dbc652b1882937ca27ea52d9f4a923 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Run DBus tests only if QtDBus is found.Stephen Kelly2012-04-241-1/+4
| | | | | | | | | It's not enough to check for UNIX because Qt may have been configured without dbus, or we could be running on APPLE (on which DBus is not commonly installed). Change-Id: Ic57200dad42c0c12b292d1066f799c827294fe9a Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Move the CMake unit tests to auto/Stephen Kelly2012-04-231-0/+97
This will allow the CI system to run the tests. The tests are only run if cmake is found. Change-Id: Ie73a56114c151871160bafcbf0b90b2d54620855 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>