Changeset 761

Timestamp:

Apr 8, 2008, 7:30:23 PM (16 years ago)

Author:

garnier

Message:

modif depuis que mon mac a plante : mise a jour des moc en mieux

Location:

trunk/geant4/config

Files:

• G4VIS_USE.gmk (modified) (1 diff)
• History (modified) (2 diffs)
• common.gmk (modified) (5 diffs)
• liblist.c (modified) (3 diffs)
• sys/Linux-icc.gmk (modified) (2 diffs)

trunk/geant4/config/G4VIS_USE.gmk

@@ -60 +60 @@
   G4VIS_USE_OPENGL = 1
   CPPFLAGS += -DG4VIS_USE_OPENGLQT
+  VISLIBS += -lG4OpenGL_moc
   INC_QT   = 1
 endif

trunk/geant4/config/History

@@ -1 @@
-$Id: History,v 1.317 2008/03/19 10:24:00 lgarnier Exp $
+$Id: History,v 1.319 2008/04/04 10:35:41 gcosmo Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      ----------------------------------------------------------
 
-19th March 2008, Laurent Garnier
- - common.gmk : Changes for moc generation. When compiling G4UI driver
-   AFTER compiling G4UI QT driver, it does not remove the moc generated files
-   and try to compile theme again and failed. Corrected.
-
-18th March 2008, Laurent Garnier
- - common.gmk : Minor changes when compiling Qt
+3rd April 2008  Gabriele Cosmo (config-V09-01-03)
+- Linux-icc.gmk: updated setup to make use of icc-10.1 and ifort-10.1;
+  changed compilation option "-mp" to more performant "-fp_model precise".
+
+2nd April 2008  Gunter Folger (config-V09-01-02)
+- Replaced gets() by safer fgets() in liblist.c.
+  (this tag does not include latest changes in interactivity.gmk)
+
+18th March 2008  Laurent Garnier
+- interactivity.gmk: moved Qt setup before X11.
 
 21st February 2008  Gabriele Cosmo (config-V09-01-01)

trunk/geant4/config/common.gmk

@@ -1 @@
-# $Id: common.gmk,v 1.50 2008/03/19 10:55:47 lgarnier Exp $
+# $Id: common.gmk,v 1.51 2008/04/04 10:35:20 gcosmo Exp $
 # ----------------------------------------------------------------
 # Common part of GNUmakefile for libraries.  John Allison, 5/7/95.
@@ -5 +5 @@
 # Libraries are created according to G4SYSTEM. G.Cosmo, 11/6/96.
 # Introduced G4LIBDIR and G4TMPDIR. G.Cosmo, 23/6/98.
-# Introduced Qt moc rule, L.Garnier 15/2/08.
 
 ifndef G4LIBDIR
@@ -12 +11 @@
 G4TMPDIR := $(G4TMP)/$(G4SYSTEM)/$(name)
 
-moc_inc = $(shell grep -l "Q_OBJECT" include/*.hh )
-moc_files := $(patsubst include/%.hh, src/%_moc.cc, $(moc_inc))
-
-
-ifeq ($(G4INTY_BUILD_QT),)
-  # not so beautiful. In therory we should only remove theses files from sources 
-  sources := $(shell rm -f $(moc_files))
-  sources := $(wildcard src/*.cc)
-endif
+sources := $(wildcard src/*.cc)
 
 ifneq ($(G4INTY_BUILD_QT),)
-  sources := $(wildcard src/*.cc)
-  sources += $(moc_files)
+  sources += $(moc_sources)
 endif
-
 
 objects := $(patsubst src/%.cc,$(G4TMPDIR)/%.o,$(sources))
@@ -76 +65 @@
 endif
 
-###############################################################################
-#
-# Actual moc files for Qt files
-#
-# moc sources and headers: used for Qt signal/slot 
-# - 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).
-
-ifneq ($(G4INTY_BUILD_QT),)
-src/%_moc.cc: include/%.hh
-        @echo Making moc file for $< ...
-        @if [ `$(QTHOME)/bin/moc -v 2>&1 | grep "Qt 3" | wc -l ` -gt 0 ]; then \
-        $(QTMOC) -o $@ $<;\
-        else $(QTMOC) $(MOC_MACRO) -o $@ $<; \
-        fi;
-endif
-
 
 ###############################################################################
@@ -114 +81 @@
 # .PHONY targets are executed regardless of time-stamp of any file of
 # same name.
-.PHONY: all moc_inc obj lib clean clean_libs includes
+.PHONY: all obj lib clean clean_libs includes
 
 obj: $(G4TMPDIR)/obj.last

trunk/geant4/config/liblist.c

@@ -1 @@
-/* $Id: liblist.c,v 1.19 2007/07/18 14:21:15 gcosmo Exp $ */
+/* $Id: liblist.c,v 1.20 2008/04/03 17:26:36 gunter Exp $ */
 
 /*
@@ -200 +200 @@
     {
       /* Get library name... */
-      gets(buffer);
+      fgets(buffer,BUFSIZE,stdin);
       if(feof(stdin)) break;
+      if (strlen(buffer) >= BUFSIZE-1)
+      {
+         fprintf(stderr,
+           " Internal ERROR: BUFSIZE too small to read library name map file\n");
+         exit(1);
+      }
+      if ( buffer[strlen(buffer)-1] == '\n') 
+        {   buffer[strlen(buffer)-1]='\0'; }  // when gets() was used, this discarded trailing \n
+
       ptr=strtok(buffer,":\n");
 
@@ -252 +261 @@
         {
           /* Get directory name... */
-          gets(buffer);
+          fgets(buffer,BUFSIZE,stdin);
+          if (strlen(buffer) >= BUFSIZE-1)
+          {
+             fprintf(stderr,
+               " Internal ERROR: BUFSIZE too small to read directory name\n");
+             exit(1);
+          }
+          if ( buffer[strlen(buffer)-1] == '\n') 
+             {   buffer[strlen(buffer)-1]='\0'; }  // when gets() was used, this discarded trailing \n
+
           ptr=strtok(buffer,"/");
           if(!ptr)

trunk/geant4/config/sys/Linux-icc.gmk

@@ -1 +1 @@
 #
-# ------ GNU/LINUX ------         Intel icc 9.1
+# ------ GNU/LINUX ------         Intel icc 10.1
 #
 ifeq ($(G4SYSTEM),Linux-icc)
   CXX       := icc
-  CXXFLAGS  := -ansi -mp -no-gcc -w1
+  CXXFLAGS  := -ansi -fp-model precise -no-gcc -w1
   ifdef G4OPTIMISE
     CXXFLAGS  += -O2
@@ -27 +27 @@
   endif
   G4RUNPATHOPTION := -Wl,-rpath -Wl,
-  CC := gcc
-  FC := gfortran
-  FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
+  CC := icc
+  FC := ifort
+  FCFLAGS += -noautomatic -assume nobscc -assume no2underscores
   FCLIBS := -lg2c -lnsl
   AR := ar r