From d37dc75116aeb55971ab44c84e8f10ed18b8a5aa Mon Sep 17 00:00:00 2001 From: Matt Fischer Date: Mon, 8 Apr 2013 17:07:13 -0500 Subject: Improve support for _PATH options Several modules, including DBus, MySQL, and OpenSSL have configure options of the form _PATH, which is used on Windows (where pkg-config is not present) to specify the locations of third-party libraries. These switches had been implemented by adding extra variables which were referenced in .pro files, to add the appropriate compiler and linker switches. This is undesirable because it means there are two independent paths for adding the switches to the build, which can get out of sync with each other, and indeed this had happened for some of the DBus tools. To remedy the situation, all three of the switches were reworked so that they added values directly to the principal variables that are used in the project files. This reduces maintenance, by ensuring that the pkg-config and non-pkg-config paths appear the same to the rest of the build system. Change-Id: Iae342f1d14b79fbcfef9fe38aadc803ad3141799 Reviewed-by: Oswald Buddenhagen --- src/sql/drivers/mysql/qsql_mysql.pri | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/sql/drivers') diff --git a/src/sql/drivers/mysql/qsql_mysql.pri b/src/sql/drivers/mysql/qsql_mysql.pri index 50f49ca548..3cfb6144a1 100644 --- a/src/sql/drivers/mysql/qsql_mysql.pri +++ b/src/sql/drivers/mysql/qsql_mysql.pri @@ -1,10 +1,8 @@ HEADERS += $$PWD/qsql_mysql_p.h SOURCES += $$PWD/qsql_mysql.cpp -!isEmpty(MYSQL_PATH) { - INCLUDEPATH += $$MYSQL_PATH/include - QMAKE_LIBDIR += $$MYSQL_PATH/lib -} +QMAKE_CXXFLAGS *= $$QT_CFLAGS_MYSQL +LIBS += $$QT_LFLAGS_MYSQL unix { isEmpty(QT_LFLAGS_MYSQL) { @@ -12,9 +10,6 @@ unix { use_libmysqlclient_r:LIBS += -lmysqlclient_r else:LIBS += -lmysqlclient } - } else { - LIBS += $$QT_LFLAGS_MYSQL - QMAKE_CXXFLAGS *= $$QT_CFLAGS_MYSQL } } else { !contains(LIBS, .*mysql.*):!contains(LIBS, .*mysqld.*):LIBS += -llibmysql -- cgit v1.2.3