- Timestamp:
- Apr 8, 2008, 7:30:23 PM (16 years ago)
- Location:
- trunk/geant4/config
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/geant4/config/G4VIS_USE.gmk
r593 r761 60 60 G4VIS_USE_OPENGL = 1 61 61 CPPFLAGS += -DG4VIS_USE_OPENGLQT 62 VISLIBS += -lG4OpenGL_moc 62 63 INC_QT = 1 63 64 endif -
trunk/geant4/config/History
r758 r761 1 $Id: History,v 1.31 7 2008/03/19 10:24:00 lgarnierExp $1 $Id: History,v 1.319 2008/04/04 10:35:41 gcosmo Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 17 17 ---------------------------------------------------------- 18 18 19 19th March 2008, Laurent Garnier 20 - common.gmk : Changes for moc generation. When compiling G4UI driver 21 AFTER compiling G4UI QT driver, it does not remove the moc generated files 22 and try to compile theme again and failed. Corrected. 23 24 18th March 2008, Laurent Garnier 25 - common.gmk : Minor changes when compiling Qt 19 3rd April 2008 Gabriele Cosmo (config-V09-01-03) 20 - Linux-icc.gmk: updated setup to make use of icc-10.1 and ifort-10.1; 21 changed compilation option "-mp" to more performant "-fp_model precise". 22 23 2nd April 2008 Gunter Folger (config-V09-01-02) 24 - Replaced gets() by safer fgets() in liblist.c. 25 (this tag does not include latest changes in interactivity.gmk) 26 27 18th March 2008 Laurent Garnier 28 - interactivity.gmk: moved Qt setup before X11. 26 29 27 30 21st February 2008 Gabriele Cosmo (config-V09-01-01) -
trunk/geant4/config/common.gmk
r758 r761 1 # $Id: common.gmk,v 1.5 0 2008/03/19 10:55:47 lgarnierExp $1 # $Id: common.gmk,v 1.51 2008/04/04 10:35:20 gcosmo Exp $ 2 2 # ---------------------------------------------------------------- 3 3 # Common part of GNUmakefile for libraries. John Allison, 5/7/95. … … 5 5 # Libraries are created according to G4SYSTEM. G.Cosmo, 11/6/96. 6 6 # Introduced G4LIBDIR and G4TMPDIR. G.Cosmo, 23/6/98. 7 # Introduced Qt moc rule, L.Garnier 15/2/08.8 7 9 8 ifndef G4LIBDIR … … 12 11 G4TMPDIR := $(G4TMP)/$(G4SYSTEM)/$(name) 13 12 14 moc_inc = $(shell grep -l "Q_OBJECT" include/*.hh ) 15 moc_files := $(patsubst include/%.hh, src/%_moc.cc, $(moc_inc)) 16 17 18 ifeq ($(G4INTY_BUILD_QT),) 19 # not so beautiful. In therory we should only remove theses files from sources 20 sources := $(shell rm -f $(moc_files)) 21 sources := $(wildcard src/*.cc) 22 endif 13 sources := $(wildcard src/*.cc) 23 14 24 15 ifneq ($(G4INTY_BUILD_QT),) 25 sources := $(wildcard src/*.cc) 26 sources += $(moc_files) 16 sources += $(moc_sources) 27 17 endif 28 29 18 30 19 objects := $(patsubst src/%.cc,$(G4TMPDIR)/%.o,$(sources)) … … 76 65 endif 77 66 78 ###############################################################################79 #80 # Actual moc files for Qt files81 #82 # moc sources and headers: used for Qt signal/slot83 # - all headers which use signals/slots have the macro "Q_OBJECT" present84 # in the class definitions; these all need to be processed by the85 # "meta object compiler (moc)" which generates extra source code to86 # implement the signal/slots, i.e., if "foo.h" contains the token "Q_OBJECT"87 # it will be used by moc to generate the file "foo_moc.cpp" (the _moc. is88 # just an arbitrary extension to make it easier to identify sources89 # generated by moc).90 91 ifneq ($(G4INTY_BUILD_QT),)92 src/%_moc.cc: include/%.hh93 @echo Making moc file for $< ...94 @if [ `$(QTHOME)/bin/moc -v 2>&1 | grep "Qt 3" | wc -l ` -gt 0 ]; then \95 $(QTMOC) -o $@ $<;\96 else $(QTMOC) $(MOC_MACRO) -o $@ $<; \97 fi;98 endif99 100 67 101 68 ############################################################################### … … 114 81 # .PHONY targets are executed regardless of time-stamp of any file of 115 82 # same name. 116 .PHONY: all moc_incobj lib clean clean_libs includes83 .PHONY: all obj lib clean clean_libs includes 117 84 118 85 obj: $(G4TMPDIR)/obj.last -
trunk/geant4/config/liblist.c
r593 r761 1 /* $Id: liblist.c,v 1. 19 2007/07/18 14:21:15 gcosmoExp $ */1 /* $Id: liblist.c,v 1.20 2008/04/03 17:26:36 gunter Exp $ */ 2 2 3 3 /* … … 200 200 { 201 201 /* Get library name... */ 202 gets(buffer);202 fgets(buffer,BUFSIZE,stdin); 203 203 if(feof(stdin)) break; 204 if (strlen(buffer) >= BUFSIZE-1) 205 { 206 fprintf(stderr, 207 " Internal ERROR: BUFSIZE too small to read library name map file\n"); 208 exit(1); 209 } 210 if ( buffer[strlen(buffer)-1] == '\n') 211 { buffer[strlen(buffer)-1]='\0'; } // when gets() was used, this discarded trailing \n 212 204 213 ptr=strtok(buffer,":\n"); 205 214 … … 252 261 { 253 262 /* Get directory name... */ 254 gets(buffer); 263 fgets(buffer,BUFSIZE,stdin); 264 if (strlen(buffer) >= BUFSIZE-1) 265 { 266 fprintf(stderr, 267 " Internal ERROR: BUFSIZE too small to read directory name\n"); 268 exit(1); 269 } 270 if ( buffer[strlen(buffer)-1] == '\n') 271 { buffer[strlen(buffer)-1]='\0'; } // when gets() was used, this discarded trailing \n 272 255 273 ptr=strtok(buffer,"/"); 256 274 if(!ptr) -
trunk/geant4/config/sys/Linux-icc.gmk
r758 r761 1 1 # 2 # ------ GNU/LINUX ------ Intel icc 9.12 # ------ GNU/LINUX ------ Intel icc 10.1 3 3 # 4 4 ifeq ($(G4SYSTEM),Linux-icc) 5 5 CXX := icc 6 CXXFLAGS := -ansi - mp-no-gcc -w16 CXXFLAGS := -ansi -fp-model precise -no-gcc -w1 7 7 ifdef G4OPTIMISE 8 8 CXXFLAGS += -O2 … … 27 27 endif 28 28 G4RUNPATHOPTION := -Wl,-rpath -Wl, 29 CC := gcc30 FC := gfortran31 FCFLAGS += - fno-automatic -fno-backslash -fno-second-underscore29 CC := icc 30 FC := ifort 31 FCFLAGS += -noautomatic -assume nobscc -assume no2underscores 32 32 FCLIBS := -lg2c -lnsl 33 33 AR := ar r
Note: See TracChangeset
for help on using the changeset viewer.