summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/create_cmake.prf
Commit message (Collapse)AuthorAgeFilesLines
* Adjust the cmake files to find the dlls in the bin dir.Stephen Kelly2013-06-151-0/+11
| | | | | | Change-Id: I840f963c3648d123b31f79aa2c8902c0ad74e982 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Only generate entries for private include dirs if they exist.Stephen Kelly2013-05-141-0/+2
| | | | | | 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-8/+11
| | | | | | | | | | | | | | | | | | 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>
* mkspecs are installed to QT_HOST_DATA instead of QT_INSTALL_ARCHDATA.Volker Krause2013-04-081-4/+4
| | | | | | | These are the same for normal builds, but differ when cross-compiling Qt. Change-Id: I75eccc6f4b67b440a08c4aba41aabb7df686c9f9 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-03-061-15/+1
|\ | | | | | | refs/staging/dev
| * Extract some cmake related functions for re-use.Stephen Kelly2013-02-251-15/+1
| | | | | | | | | | | | | | These will be used by ctest_testcase.prf. Change-Id: I8a0e6e1eb110daba41b007c8309f3cb9a2059ecb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Distinguish between 'mac' and 'macx' qmake scopesTor Arne Vestbø2013-03-051-1/+1
|/ | | | | | | | | | | | | | The former applies both on Mac OS X and iOS, but 'macx' is specific to Mac OS X. ios.conf and macx.conf now share most of their settings in the common mac.conf. We set the default QMAKE_MAC_SDK before loading mac.conf, so that any overrides in the device config will apply afterwards. This means configure's mkspec parsing will be able to read the QMAKE_MAC_SDK. Change-Id: I0c7e26a6a0103e19b23ef152aa9e4ab461cee632 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Make cmake packages installed to /usr non-relocatable.Stephen Kelly2013-02-141-4/+14
| | | | | | | | | | | | | | This is for dealing with fallout from the UsrMove: http://fedoraproject.org/wiki/Features/UsrMove http://thread.gmane.org/gmane.comp.programming.tools.cmake.devel/5327 http://thread.gmane.org/gmane.comp.programming.tools.cmake.devel/5868/focus=5907 Change-Id: I6380e3bad17a016a8252b615ce962e3008a5d809 Reviewed-by: Brad King <brad.king@kitware.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix regex for determining if a path is relative.Stephen Kelly2013-02-111-4/+4
| | | | | Change-Id: I3d638220e16c215b737417c2bf8de02ddf4a8199 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Use new path manipulation functions from qmake.Stephen Kelly2013-01-241-21/+20
| | | | | | | | This is a less error-prone way to calculate relative paths. Task-number: QTBUG-29110 Change-Id: If4509ef278e48dcf08bdcc904d21534b4c05993f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* The executables always go into QT_HOST_BINS.Stephen Kelly2013-01-091-1/+1
| | | | | | | | Task-number: QTBUG-28922 Change-Id: I7afaee292a0026d67866e4f1f711296adee8f8de Reviewed-by: Andy Nichols <andy.nichols@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix the computation of the location of mkspecs.Stephen Kelly2012-12-201-4/+4
| | | | | | | | | The location of the mkspecs directory comes from the archdatadir, which distros will all set. Change-Id: I20dbdce76db13dbd37eec065009e215f98985907 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* mark a bunch of features as internalOswald Buddenhagen2012-12-121-0/+10
| | | | | Change-Id: I5ad28827ff317985414e859263af85ceec31207c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* move cmake template files under features/data/Oswald Buddenhagen2012-12-071-2/+2
| | | | | | | | | 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>
* Only generate -fPIE on unix.Stephen Kelly2012-12-071-1/+1
| | | | | | | | This follows the same logic used to set bsymbolic_functions. Change-Id: I9300eab8a1b6673c4409b5dd07b40123fdf00d69 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Topologically sort $${MODULE}.depends when generating cmake files.Stephen Kelly2012-12-071-1/+1
| | | | | | | | | | | | The contents of this eventually go into a CMake target property IMPORTED_LINK_INTERFACE_LIBRARIES, which seems to expect sorted input. Usually the contents is generated by CMake itself, so generating content it expects is reasonable. This fixes the qtactiveqt cmake unit test with MingW on linux. Change-Id: I2a540bea5c3ac214ad4e1dfedfb7cbd2f863472b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Refactor create_cmake to re-use the computed stem.Stephen Kelly2012-11-131-27/+29
| | | | | | Change-Id: I3b277316b1befbb57613b465fc5bbedc6b2305f7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Insert the Qt major version (5) in the library namesThiago Macieira2012-11-101-27/+27
| | | | | | | | | | | As discussed on the mailing list, insert the Qt major library version in the library name, so even the development files can be co-installed with Qt 4. Discussed-on: http://lists.qt-project.org/pipermail/development/2012-September/006545.html Discussed-on: http://lists.qt-project.org/pipermail/development/2012-September/006551.html Change-Id: If0be11ebf9454a9fb6d96cda161790dfd53c00f5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Use the new QMAKE_XSPEC to get the mkspec.Stephen Kelly2012-11-011-1/+1
| | | | | Change-Id: I7f307ffe0954464f68192f9f3781bdb206f87809 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Use a qmake variable to pass the Qt version to the cmake version file.Stephen Kelly2012-10-191-0/+2
| | | | | | | | By depending on a simple variable instead of a more complex expression, we can more easily use this file from other contexts. Change-Id: Ib6ce1e2537f3e7ac19d25ad33454f25e85f71040 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Use the mkspec name Qt was configured with instead of default symlinkStephen Kelly2012-10-161-0/+2
| | | | | | | | | The default symlink is not available on Windows, so the qplatformdefs.h header is not available there. Instead we can bypass the symlink and use the actual mkspec name directly. Change-Id: I1d7e05f35c1ff56befab5bed307cb1755ade8377 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* CMake: Fix the generated location of static libraries.Stephen Kelly2012-09-261-0/+2
| | | | | | | | | We need to make sure to put the .lib file into the LOCATION property, not the .dll file, when building a static library. Change-Id: I8912abfd172d0939cd07ba02901ab58093ccefa1 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* CMake: Specify the prl files when building with mingw.Stephen Kelly2012-09-261-0/+3
| | | | | | | | | As was done in ae6d4c77eb338be3f2189bfaffdcd3c38cc57333, but that commit missed the mingw branch. Change-Id: I1d76ed2f8070dced2749aabe889fee48c4086744 Reviewed-by: Peter Kümmel <syntheticpp@gmx.net> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* cmake: use .exe suffix only on WindowsPeter Kümmel2012-08-281-1/+1
| | | | | | Change-Id: I36ba61bd4690de0bfe4a44e579eb554c82b53bb4 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix CMake file INSTALLS with debug_and_release configurations.Stephen Kelly2012-08-281-3/+3
| | | | | | | Change-Id: Iad0161969e3632862102703fcc239358387e2181 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Peter Kümmel <syntheticpp@gmx.net> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Make it possible to use static builds of Qt with CMake.Stephen Kelly2012-08-271-0/+8
| | | | | | | | | | | Parse the prl files generated by qmake to get the link dependencies. They contain all the information we need, and they are the only location with all the right information. Change-Id: Id9dcc988f20a744297502eff008de085326cdbcf Reviewed-by: Brad King <brad.king@kitware.com> Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Check if we are creating a static library before a framework.Stephen Kelly2012-07-201-7/+7
| | | | | | | | | | Even if we are building frameworks, we still build some static libraries (eg QtUiTools). Static libraries are never in frameworks so we need to ensure that we don't generate a path to a framework in the CMake config file in that case. Change-Id: I533e30874a653695cb0e262617e71bbd3d4c954b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Create imported targets if the library files existStephen Kelly2012-07-161-0/+1
| | | | | | | | | | | | | | | | | | Handle the cases where the user does ./configure -debug make make install make release make release_install Thereby making the installed configuration different to the 'configured' configuration. Change-Id: Ib351d8a84c4333ebcbd305d68a37c16f86869559 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Brad King <brad.king@kitware.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* don't unnecessarily normalize $$[QT_INSTALL_*] any moreOswald Buddenhagen2012-07-121-5/+5
| | | | | | | they are always normalized nowadays Change-Id: I2d6d00639a4838da1a4def93a3416b000b8cd589 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Set the IMPORTED_SONAME for imported targets.Stephen Kelly2012-07-111-0/+1
| | | | | | | | | On windows this doesn't need to be set. On Mac I'm not sure yet on the various configurations. Change-Id: I31f191711a2ae0a1bb7221ae6e1fef377d62f1dc Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix the name of _debug libraries on APPLE.Stephen Kelly2012-07-111-2/+2
| | | | | | Change-Id: Id3ae730c0ce0630f8ccc222fe09e5d3da23d124d Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Uppercase the CONFIG for verbatim mode.Stephen Kelly2012-07-041-1/+1
| | | | | Change-Id: Iec883e0218af80fc329d866affb2b95db72c54d3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Don't re-evaluate the lib location.Stephen Kelly2012-06-261-4/+4
| | | | | | | Rely on the DESTDIR variable being set correctly by qt_module_config. Change-Id: I1a166124024722ec5a189a7402b38646179aa890 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Revert "Don't use the pri depends line for link dependencies."Stephen Kelly2012-05-031-0/+4
| | | | | | | | | | | | | 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>
* Fix creation of config files in debug mode.Stephen Kelly2012-04-241-2/+16
| | | | | | | f88212c22f7e4bec261130a6f82294adfc75abca was not complete. Change-Id: Ie5b1bb4832176ec8a72ace473f7dbc6c4de10ff2 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Don't tell CMake we're making debug libraries if we're not.Stephen Kelly2012-04-231-2/+2
| | | | | | | | | | | | The config option debug_and_release is set on Windows and on mac (unless xcode is used independently of whether Qt is configured with -release or not.) We need to check CONFIG(release,debug|release) to see if -release was set. Change-Id: Ibf952958874f6b102981526b3397e848c207a3f2 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Don't use the pri depends line for link dependencies.Stephen Kelly2012-03-281-4/+0
| | | | | | | | | That is not what depends is for. Change-Id: Iabf93e890f009bd6c8fcc18dde1891bf20a493f1 Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Prefix the variables for debug and release types properly.Stephen Kelly2012-03-281-4/+4
| | | | | Change-Id: I346992effa997f60a4fd20055f0af81d6a084095 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix the include dir used by the CMake config files.Stephen Kelly2012-02-291-1/+1
| | | | | | | I missed this one in 018e78575c6f7f5a90b41274468a26b09b909443 Change-Id: I194b96d2b1a64025ddb17fe2ed81566838555e13 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make the CMake files work with directory overrides.Stephen Kelly2012-02-281-6/+33
| | | | | | | | | | | | 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>
* Fix the library names on MinGW.Stephen Kelly2012-02-241-10/+20
| | | | | | Change-Id: I6c2008a0e7a07ca0603b8aa9362d31fa4ef7310a Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Add the QtMain windows library to the CMake files.Stephen Kelly2012-02-231-0/+9
| | | | | | | | 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>
* Fix warnings about existing directories during cmake file creation.Stephen Kelly2012-02-111-9/+6
| | | | | | | Use the new QMAKE_SUBSTITUTES.config = vebatim feature. Change-Id: I4c08bd4694c11d48434eb225fc6902e69a4cdec2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add -fPIE to the Qt5Core_COMPILE_FLAGS with reduce-relocations.Stephen Kelly2012-02-101-0/+2
| | | | | | | | | | 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 special casing for static modules.Stephen Kelly2012-02-071-5/+5
| | | | | | | | | QtUITools is a static library, so we need to mark that in its CMakeConfig.cmake file. Change-Id: I4e3684f7c62f4af28956a6e8f58edce7724f50dd Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix cmake files for static builds.Stephen Kelly2011-12-231-8/+25
| | | | | | Change-Id: I3864017df6fc0daeb31b389c8883401d344730bf 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-0/+1
| | | | | | Change-Id: I257bb7d62ae18ea529df6b10694fcf25eedc83f4 Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make the Qt5 part of the target name namespace style.Stephen Kelly2011-12-021-2/+2
| | | | | | | | 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-291-0/+100
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 17:17:04 +0000