diff --git a/graf2d/qt/Module.mk b/graf2d/qt/Module.mk index 820374119970d0222ab607621bd7c29d66eea33b..6cf961cca2fa9c915817f4137dcd8c44816173dc 100644 --- a/graf2d/qt/Module.mk +++ b/graf2d/qt/Module.mk @@ -128,13 +128,21 @@ ifeq ($(subst $(GCC_MINOR),,0 1),0 1) $(GQTO): CXXFLAGS += -Wno-strict-overflow endif endif -ifneq ($(CLANG_MAJOR)$(GCC_MAJOR),) -# Building with clang or GCC +ifneq ($(GCC_MAJOR),) +# Building with GCC $(GQTO) : CXXFLAGS += -Wno-deprecated-register -Wno-uninitialized $(GQTDO) : CXXFLAGS += -Wno-deprecated-register -Wno-uninitialized $(GQTMOCO): CXXFLAGS += -Wno-deprecated-register -Wno-uninitialized endif +ifneq ($(CLANG_MAJOR),) +# Building with clang +$(GQTO) : CXXFLAGS += -Wno-deprecated -Wno-uninitialized +$(GQTDO) : CXXFLAGS += -Wno-deprecated -Wno-uninitialized +$(GQTMOCO): CXXFLAGS += -Wno-deprecated -Wno-uninitialized +endif + + $(GQTMOC) : $(call stripsrc,$(GQTDIRS)/moc_%.cxx): $(GQTDIRI)/%.h $(MAKEDIR) ifeq (,$(QT4)) diff --git a/gui/qtgsi/Module.mk b/gui/qtgsi/Module.mk index f2b602d368d8b899193aeb2afd8baefecfdaec1a..2c0101efbd55fb50436a57bf988858db8636be2b 100644 --- a/gui/qtgsi/Module.mk +++ b/gui/qtgsi/Module.mk @@ -34,10 +34,14 @@ QTGSIDEP := $(QTGSIO:.o=.d) $(QTGSIDO:.o=.d) $(QTGSIMOCO:.o=.d) QTGSICXXFLAGS := -DQT3_SUPPORT -DQT_DLL -DQT_THREAD_SUPPORT -I. $(QTINCDIR:%=-I%) -ifneq ($(CLANG_MAJOR)$(GCC_MAJOR),) -# Building with clang or GCC +ifneq ($(GCC_MAJOR),) +# Building with GCC QTGSICXXFLAGS += -Wno-deprecated-register -Wno-uninitialized endif +ifneq ($(CLANG_MAJOR),) +# Building with clang +QTGSICXXFLAGS += -Wno-deprecated -Wno-uninitialized +endif QTGSILIB := $(LPATH)/libQtGSI.$(SOEXT) diff --git a/gui/qtroot/Module.mk b/gui/qtroot/Module.mk index 146f0f7c2189f7907122c9ca8845f92eefd1de4f..18ccb9ef1fd3561c0ccf7ba9516216501332a67f 100644 --- a/gui/qtroot/Module.mk +++ b/gui/qtroot/Module.mk @@ -74,7 +74,11 @@ distclean:: distclean-$(MODNAME) ##### extra rules ###### $(sort $(QTROOTO)) $(QTROOTDO): CXXFLAGS := $(filter-out -Wshadow,$(CXXFLAGS)) $(sort $(QTROOTO)) $(QTROOTDO): CXXFLAGS += $(GQTCXXFLAGS) -ifneq ($(CLANG_MAJOR)$(GCC_MAJOR),) -# Building with clang or GCC +ifneq ($(GCC_MAJOR),) +# Building with GCC $(sort $(QTROOTO)) $(QTROOTDO): CXXFLAGS += -Wno-deprecated-register -Wno-uninitialized endif +ifneq ($(CLANG_MAJOR),) +# Building with clang +$(sort $(QTROOTO)) $(QTROOTDO): CXXFLAGS += -Wno-deprecated -Wno-uninitialized +endif \ No newline at end of file