summaryrefslogtreecommitdiffstats
path: root/src/sql/configure.pri
Commit message (Collapse)AuthorAgeFilesLines
* work around mysql_config returning denormalized include pathsOswald Buddenhagen2017-02-021-2/+5
| | | | | | | | | "/usr/include/mysql/.." would slip by the removal of default include directories. so clean up the returned paths first. Task-number: QTBUG-58532 Change-Id: I445bb15619f6401494e8fffd149ea41a50ef188e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* configure: make library sources fail more verboselyOswald Buddenhagen2016-12-301-0/+2
| | | | | | | | log a message in all unsuccessful exit paths. Task-number: QTBUG-57217 Change-Id: I8b0f2685d327da583c3e42c8149327e05b2a66cc Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* MySQL: Make sure we clean the libraries from mysql_configThiago Macieira2016-12-141-0/+8
| | | | | | | | | | | | | | | | | | | | It prints libraries necessary for linking against the MySQL static library. When linking against dynamic libraries, we end up with too many parameters. We don't want to explicitly link our plugin to OpenSSL and this is especially important on macOS since Sierra no longer comes with OpenSSL development files. On my Linux: -L/usr/lib64 -lmysqlclient -lpthread -lz -lm -lssl -lcrypto -ldl On my macOS: -L/usr/local/Cellar/mysql/5.7.16/lib -lmysqlclient -lssl -lcrypto Instead, keep only -L options (that haven't been removed by the function $$filterLibraryPath above) and the actual client library. Change-Id: I3e3f0326f7234a26acf5fffd148fa985d0fd9c93 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Make sure flags from library detections go to the right placesThiago Macieira2016-10-101-6/+0
| | | | | | | | | | | | | | | | | Split them and add -I flags to INCLUDEPATH and -D flags to DEFINES. Anything else gets reported as a problem and dropped. This has the benefit that qmake will automatically use -isystem for those paths if they lie in a system directory. As a consequence of that, we won't get any warnings in headers located there. There are multiple cases of glib, gtk, etc. headers producing warnings (such as enums ending in comma). This does not fix warnings produced by use of macros declared in system headers, though... Done-with: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Change-Id: I4b844cb518dbae5ea499811221f9015af985110a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Modularize configure.json/.priLars Knoll2016-09-151-0/+89
Move the different parts of configure.json/.pri into the libraries where they belong. Gui is not yet fully modularized, and contains many things related to the different QPA plugins. Done-with: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Change-Id: I6659bb29354ed1f36b95b8c69e7fce58f642053f Reviewed-by: Lars Knoll <lars.knoll@qt.io>