From 4f195b3a280a2ced27028a210ae88724f6fe56d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= Date: Tue, 3 Feb 2015 14:15:10 +0100 Subject: [PATCH 7/7] Honor CFLAGS in qmake rpm complained about files not compile with RPM_OPT_FLAGS http://stackoverflow.com/questions/17578150/add-cflags-to-qmake-project-without-hard-coding-them-in-the-pro-file --- src/libpcp_qed/src/libpcp_qed.pro | 1 + src/libpcp_qmc/src/libpcp_qmc.pro | 1 + src/libpcp_qwt/src/libpcp_qwt.pro | 1 + src/pmdumptext/pmdumptext.pro | 1 + src/pmquery/pmquery.pro | 1 + src/pmtime/pmtime.pro | 1 + 6 files changed, 6 insertions(+) diff --git a/src/libpcp_qed/src/libpcp_qed.pro b/src/libpcp_qed/src/libpcp_qed.pro index 6a3c872a4b87..c67f1d63290d 100644 --- a/src/libpcp_qed/src/libpcp_qed.pro +++ b/src/libpcp_qed/src/libpcp_qed.pro @@ -6,6 +6,7 @@ INCLUDEPATH += ../../include ../../libpcp_qmc/src release:DESTDIR = build/debug debug:DESTDIR = build/release QT = core gui network svg +QMAKE_CXXFLAGS += $$(PCP_CFLAGS) HEADERS = qed.h \ qed_actionlist.h \ diff --git a/src/libpcp_qmc/src/libpcp_qmc.pro b/src/libpcp_qmc/src/libpcp_qmc.pro index 39671ab2dceb..b59ffa4e6bb9 100644 --- a/src/libpcp_qmc/src/libpcp_qmc.pro +++ b/src/libpcp_qmc/src/libpcp_qmc.pro @@ -5,6 +5,7 @@ CONFIG += qt staticlib warn_on INCLUDEPATH += ../../include release:DESTDIR = build/debug debug:DESTDIR = build/release +QMAKE_CXXFLAGS += $$(PCP_CFLAGS) HEADERS = qmc_context.h qmc_desc.h qmc_group.h \ qmc_indom.h qmc_metric.h qmc_source.h \ diff --git a/src/libpcp_qwt/src/libpcp_qwt.pro b/src/libpcp_qwt/src/libpcp_qwt.pro index 1a7b1d8b736c..6badfc328605 100644 --- a/src/libpcp_qwt/src/libpcp_qwt.pro +++ b/src/libpcp_qwt/src/libpcp_qwt.pro @@ -5,6 +5,7 @@ CONFIG += qt staticlib warn_on release:DESTDIR = build/debug debug:DESTDIR = build/release QT = core gui network svg +QMAKE_CXXFLAGS += $$(PCP_CFLAGS) HEADERS += \ qwt.h \ diff --git a/src/pmdumptext/pmdumptext.pro b/src/pmdumptext/pmdumptext.pro index d521e2f40cb7..f9048bb1a037 100644 --- a/src/pmdumptext/pmdumptext.pro +++ b/src/pmdumptext/pmdumptext.pro @@ -9,3 +9,4 @@ LIBS += -L../libpcp/src LIBS += -L../libpcp_qmc/src -L../libpcp_qmc/src/$$DESTDIR LIBS += -lpcp_qmc -lpcp QT -= gui +QMAKE_CXXFLAGS += $$(PCP_CFLAGS) diff --git a/src/pmquery/pmquery.pro b/src/pmquery/pmquery.pro index 6a4293fb7a23..d9392931888c 100644 --- a/src/pmquery/pmquery.pro +++ b/src/pmquery/pmquery.pro @@ -7,3 +7,4 @@ RESOURCES = pmquery.qrc CONFIG += qt warn_on release:DESTDIR = build/debug debug:DESTDIR = build/release +QMAKE_CXXFLAGS += $$(PCP_CFLAGS) diff --git a/src/pmtime/pmtime.pro b/src/pmtime/pmtime.pro index ad3e1932e7b1..4605765cab79 100644 --- a/src/pmtime/pmtime.pro +++ b/src/pmtime/pmtime.pro @@ -22,3 +22,4 @@ LIBS += -lpcp_qwt -lpcp_qmc -lpcp win32:LIBS += -lwsock32 QT += network QMAKE_INFO_PLIST = pmtime.info +QMAKE_CXXFLAGS += $$(PCP_CFLAGS) -- 2.1.2