Changeset 643 for trunk/geant4/config/common.gmk

Timestamp:

Dec 7, 2007, 2:57:31 PM (17 years ago)

Author:

garnier

Message:

premiere version de la correction du ticket #99

File:

• trunk/geant4/config/common.gmk (modified) (5 diffs)

trunk/geant4/config/common.gmk

@@ -11 +11 @@
 G4TMPDIR := $(G4TMP)/$(G4SYSTEM)/$(name)
 
+all : moc ;
+moc : lib ;
 sources := $(wildcard src/*.cc)
 objects := $(patsubst src/%.cc,$(G4TMPDIR)/%.o,$(sources))
@@ -33 +35 @@
 # Actual gmake targets.
 #
-
 lib: $(g4libraries_to_build)
 
@@ -62 +63 @@
 ###############################################################################
 #
+# Actual moc files for qt files
+#
+# moc sources and headers: used for Qt signal/slot constructs in ui code
+# - all headers which use signals/slots have the macro "Q_OBJECT" present
+#  in the class definitions; these all need to be processed by the
+#  "meta object compiler (moc)" which generates extra source code to
+#  implement the signal/slots, i.e., if "foo.h" contains the token "Q_OBJECT"
+#  it will be used by moc to generate the file "foo.moc.cpp" (the .moc. is
+#   just an arbitrary extension to make it easier to identify sources
+#   generated by moc). Use 'grep -l' to list all the files containing the token
+
+MOC_HDRS = $(shell grep -l "Q_OBJECT" include/*.hh )
+MOC_SRCS = $(patsubst include/%.hh, src/%_moc_tmp.cc, $(MOC_HDRS))
+moc : $(MOC_SRCS)
+
+MOC = $(QTHOME)/bin/moc
+
+src/%_moc_tmp.cc: include/%.hh
+        @echo Making moc file for $< ...
+        @if [ `$(QTHOME)/bin/moc -v 2>&1 | grep "Qt 4" | wc -l ` -gt 0 ]; then \
+        $(MOC) -o $@ $<;\
+        else $(MOC) $(MOC_MACRO) -o $@ $<; \
+        fi;
+
+#       @echo Making moc file for $< ...
+#       @if [ `$(QTHOME)/bin/moc -v 2>&1 | grep "Qt 3" | wc -l ` -gt 0 ]; then \
+#       @$(MOC) -o $@ $<;\
+#       else @$(MOC) $(MOC_MACRO) -o $@ $<;
+#       fi;
+
+###############################################################################
+#
 # Actual targets for .o, .d files
 #
@@ -69 +102 @@
         $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(OUT_OBJ)$(G4TMPDIR)/$(*F).o src/$*.cc
 else
-        @echo Compiling $*.cc ...
+        @echo Compiling $*.cc ... 
         @$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(OUT_OBJ)$(G4TMPDIR)/$(*F).o src/$*.cc
 endif
@@ -104 +137 @@
 
 $(G4TMPDIR)/%.d: src/%.cc
-        @echo Making dependency for file $< ...
+        @echo Making dependency for file $< 
         @if [ ! -d $(G4TMPDIR) ] ; then mkdir -p $(G4TMPDIR)  ;fi
         @set -e;\