From 4c166a146ea7bdb8e1601d99d65e8bd2af6aa01a Mon Sep 17 00:00:00 2001 From: hristov Date: Thu, 16 Sep 2010 12:24:35 +0000 Subject: [PATCH 1/1] Corrected library order + fixes needed to compile static libraries and executables (Johny) --- ALIROOT/binaliroot.pkg | 27 ++++++++--- ANALYSIS/binaliengui.pkg | 16 +++++-- EVE/binalieve.pkg | 48 +++++++++++++------- EVE/binalihlteve.pkg | 47 ++++++++++++------- HLT/bindHLTdumpraw.pkg | 25 ++++++++--- HLT/bindHLTrootify.pkg | 24 ++++++++-- MONITOR/binalionlinemonitor.pkg | 27 ++++++++++- MONITOR/binalitestproc.pkg | 27 ++++++++++- RAW/dateStream.cxx | 80 ++++++++++++++++----------------- cmake/modules/ALICEMacros.cmake | 8 ++-- 10 files changed, 232 insertions(+), 97 deletions(-) diff --git a/ALIROOT/binaliroot.pkg b/ALIROOT/binaliroot.pkg index 8f6a645e05a..48b0a2e583f 100644 --- a/ALIROOT/binaliroot.pkg +++ b/ALIROOT/binaliroot.pkg @@ -7,7 +7,18 @@ ELIBSDIR:= -ELIBS:= MUONcore MUONgeometry MUONrec MUONsim MUONbase MUONtrigger MUONraw MUONcalib MUONmapping \ +ELIBS:= MUONevaluation \ + MUONmapping \ + MUONshuttle \ + MUONgraphics \ + MUONsim \ + MUONrec \ + MUONgeometry \ + MUONcalib \ + MUONbase \ + MUONraw \ + MUONtrigger \ + MUONcore \ TPCbase TPCsim TPCrec TPCfast \ ITSbase ITSsim ITSrec PMDbase PMDsim PMDrec TRDbase \ TRDsim TRDrec TRDfast \ @@ -16,10 +27,16 @@ ELIBS:= MUONcore MUONgeometry MUONrec MUONsim MUONbase MUONtrigger MUONraw MUONc HMPIDbase HMPIDrec HMPIDsim \ ZDCbase ZDCsim ZDCrec VZERObase VZEROsim VZEROrec \ EMCALUtils EMCALbase EMCALsim EMCALrec BCM \ - STRUCT T0base T0sim T0rec EVGEN STEERBase ESD AOD CDB STEER \ - FASTSIM microcern \ - RAWDatabase RAWDatarec RAWDatasim \ - HLTbase MUONevaluation TRIGGERbase STAT + STRUCT T0base T0sim T0rec EVGEN \ + FASTSIM microcern \ + HLTbase TRIGGERbase STAT \ + STEER \ + CDB \ + AOD \ + ESD \ + STEERBase \ + RAWDatasim RAWDatarec RAWDatabase + # THijing hijing \ # THbtp TEPEMGEN \ # THerwig herwig TPHIC diff --git a/ANALYSIS/binaliengui.pkg b/ANALYSIS/binaliengui.pkg index 97372b67c4e..ee4f90308c1 100644 --- a/ANALYSIS/binaliengui.pkg +++ b/ANALYSIS/binaliengui.pkg @@ -5,7 +5,17 @@ CSRCS := EINCLUDE := ELIBSDIR := ELIBS := Aliengui \ - MUONevaluation MUONgeometry MUONrec MUONsim MUONbase MUONtrigger MUONraw MUONcalib MUONmapping MUONcore \ + ANALYSISalice ANALYSIS \ + MUONmapping \ + MUONevaluation \ + MUONsim \ + MUONrec \ + MUONgeometry \ + MUONcalib \ + MUONbase \ + MUONraw \ + MUONtrigger \ + MUONcore \ TPCbase TPCsim TPCrec TPCfast \ ITSbase ITSsim ITSrec PMDbase PMDsim PMDrec TRDbase \ TRDsim TRDrec TRDfast \ @@ -17,9 +27,9 @@ ELIBS := Aliengui \ STRUCT T0base T0sim T0rec EVGEN STEERBase ESD AOD CDB STEER \ THijing hijing THbtp TEPEMGEN \ FASTSIM microcern \ - RAWDatabase RAWDatarec RAWDatasim \ + RAWDatasim RAWDatarec RAWDatabase\ HLTbase \ - ANALYSIS ANALYSISalice STAT + STAT ifeq (yes,$(CHECKXML)) PACKCXXFLAGS += $(CXXFLAGS) -DWITHXML diff --git a/EVE/binalieve.pkg b/EVE/binalieve.pkg index 435d3c06587..3f3b1e360c7 100644 --- a/EVE/binalieve.pkg +++ b/EVE/binalieve.pkg @@ -9,23 +9,37 @@ EINCLUDE := ELIBSDIR := ELIBS := EveBase EveDet \ - MUONbase MUONevaluation MUONmapping MUONshuttle MUONcalib MUONgeometry \ - MUONraw MUONsim MUONcore MUONgraphics MUONrec MUONtrigger \ - TPCbase TPCsim TPCrec TPCfast \ - ITSbase ITSsim ITSrec PMDbase PMDsim PMDrec TRDbase \ - TRDsim TRDrec TRDfast \ - FMDbase FMDsim FMDrec TOFbase TOFrec TOFsim PHOSUtils PHOSbase PHOSsim PHOSrec \ - ACORDEbase ACORDEsim ACORDErec \ - HMPIDbase HMPIDrec HMPIDsim \ - ZDCbase ZDCsim ZDCrec VZERObase VZEROsim VZEROrec \ - EMCALUtils EMCALbase EMCALsim EMCALrec BCM \ - STRUCT T0base T0sim T0rec EVGEN STEERBase ESD AOD CDB STEER MONITOR \ - ANALYSIS ANALYSISalice \ - THijing \ - hijing THbtp TEPEMGEN \ - FASTSIM microcern \ - RAWDatabase RAWDatarec RAWDatasim \ - HLTbase XMLParser STAT + MONITOR \ + MUONmapping \ + MUONevaluation \ + MUONsim \ + MUONrec \ + MUONgeometry \ + MUONcalib \ + MUONbase \ + MUONraw \ + MUONtrigger \ + MUONcore \ + TPCfast TPCsim TPCrec TPCbase \ + ITSbase ITSsim ITSrec PMDbase PMDsim PMDrec TRDbase \ + TRDsim TRDrec TRDfast \ + FMDbase FMDsim FMDrec TOFbase TOFrec TOFsim PHOSUtils PHOSbase PHOSsim PHOSrec \ + ACORDEbase ACORDEsim ACORDErec \ + HMPIDbase HMPIDrec HMPIDsim \ + ZDCbase ZDCsim ZDCrec VZERObase VZEROsim VZEROrec \ + EMCALUtils EMCALbase EMCALsim EMCALrec BCM \ + STRUCT T0base T0sim T0rec EVGEN \ + STEER \ + CDB \ + AOD \ + ESD \ + STEERBase \ + ANALYSISalice ANALYSIS \ + THijing \ + hijing THbtp TEPEMGEN \ + FASTSIM microcern \ + RAWDatasim RAWDatarec RAWDatabase \ + HLTbase XMLParser STAT PACKBLIBS := $(ROOTCLIBS) $(ROOTPLIBS) -lTreePlayer -lGeomPainter -lGed -lRGL -lEve $(SYSLIBS) diff --git a/EVE/binalihlteve.pkg b/EVE/binalihlteve.pkg index ce98eef7743..4417f06bf4d 100644 --- a/EVE/binalihlteve.pkg +++ b/EVE/binalihlteve.pkg @@ -9,23 +9,36 @@ EINCLUDE := ELIBSDIR := ELIBS := EveBase EveHLT EveDet \ - HLTbase HLTrec AliHLTUtil AliHLTEve AliHLTTPC TPCcalib AliHLTRCU AliHLTMUON \ - TPCbase TPCsim TPCrec \ - ITSbase ITSrec \ - TRDbase TRDrec AliHLTTRD \ - PHOSbase PHOSUtils \ - EMCALbase EMCALUtils EMCALrec EMCALsim TRIGGERbase VZERObase VZEROrec VZEROsim TRIGGERbase \ - MUONbase MUONevaluation MUONmapping MUONshuttle MUONcalib MUONgeometry \ - MUONraw MUONsim MUONcore MUONgraphics MUONrec MUONtrigger \ - STEERBase ESD AOD CDB STEER MONITOR \ - ANALYSIS ANALYSISalice \ - FASTSIM microcern \ - RAWDatabase RAWDatarec RAWDatasim \ - XMLParser STAT \ - TOFbase TOFsim \ - FMDbase FMDsim FMDrec \ - PMDbase \ - T0base + MONITOR \ + HLTbase HLTrec AliHLTUtil AliHLTEve AliHLTTPC TPCcalib AliHLTRCU AliHLTMUON \ + TPCsim TPCrec TPCbase\ + ITSbase ITSrec \ + TRDbase TRDrec AliHLTTRD \ + PHOSbase PHOSUtils \ + EMCALbase EMCALUtils EMCALrec EMCALsim TRIGGERbase VZERObase VZEROrec VZEROsim TRIGGERbase \ + MUONmapping \ + MUONevaluation \ + MUONsim \ + MUONrec \ + MUONgeometry \ + MUONcalib \ + MUONbase \ + MUONraw \ + MUONtrigger \ + MUONcore \ + STEER \ + CDB \ + AOD \ + ESD \ + STEERBase \ + ANALYSISalice ANALYSIS \ + FASTSIM microcern \ + RAWDatasim RAWDatarec RAWDatabase \ + XMLParser STAT \ + TOFbase TOFsim \ + FMDbase FMDsim FMDrec \ + PMDbase \ + T0base PACKBLIBS := $(ROOTCLIBS) $(ROOTPLIBS) -lTreePlayer -lGeomPainter -lGed -lRGL -lEve $(SYSLIBS) diff --git a/HLT/bindHLTdumpraw.pkg b/HLT/bindHLTdumpraw.pkg index d95575d8161..cf34b815285 100644 --- a/HLT/bindHLTdumpraw.pkg +++ b/HLT/bindHLTdumpraw.pkg @@ -20,11 +20,26 @@ EINCLUDE := HLT/BASE HLT/MUON MUON RAW PACKBLIBS := $(ROOTCLIBS) $(SYSLIBS) -ELIBS := STEERBase ESD AOD RAWDatabase RAWDatarec RAWDatasim \ - CDB STEER HLTbase MUONevaluation MUONsim MUONrec \ - MUONbase MUONtrigger MUONgeometry MUONraw MUONcalib MUONmapping MUONcore \ - AliHLTMUON - +ELIBS := AliHLTMUON \ + HLTbase \ + MUONmapping \ + MUONevaluation \ + MUONsim \ + MUONrec \ + MUONgeometry \ + MUONcalib \ + MUONbase \ + MUONraw \ + RAWDatasim \ + MUONtrigger \ + MUONcore \ + STEER \ + CDB \ + AOD \ + RAWDatarec \ + ESD \ + RAWDatabase \ + STEERBase include $(MODDIR)/hlt.conf EDEFINE := ${HLTDEFS} PACKCXXFLAGS := ${HLTCXXFLAGS} diff --git a/HLT/bindHLTrootify.pkg b/HLT/bindHLTrootify.pkg index a9d156a7b49..f1a6399dfcc 100644 --- a/HLT/bindHLTrootify.pkg +++ b/HLT/bindHLTrootify.pkg @@ -20,10 +20,26 @@ EINCLUDE := HLT/BASE HLT/MUON MUON PACKBLIBS := $(ROOTCLIBS) $(SYSLIBS) -ELIBS := STEERBase ESD AOD RAWDatabase RAWDatarec RAWDatasim \ - CDB STEER HLTbase MUONevaluation MUONsim MUONrec \ - MUONbase MUONtrigger MUONgeometry MUONraw MUONcalib MUONmapping MUONcore \ - AliHLTMUON +ELIBS := AliHLTMUON \ + HLTbase \ + MUONmapping \ + MUONevaluation \ + MUONsim \ + MUONrec \ + MUONgeometry \ + MUONcalib \ + MUONbase \ + MUONraw \ + RAWDatasim \ + MUONtrigger \ + MUONcore \ + STEER \ + CDB \ + AOD \ + RAWDatarec \ + ESD \ + RAWDatabase \ + STEERBase include $(MODDIR)/hlt.conf EDEFINE := ${HLTDEFS} diff --git a/MONITOR/binalionlinemonitor.pkg b/MONITOR/binalionlinemonitor.pkg index ca1910abcad..3b1b6de2abb 100644 --- a/MONITOR/binalionlinemonitor.pkg +++ b/MONITOR/binalionlinemonitor.pkg @@ -6,7 +6,32 @@ EINCLUDE+= TPC ITS RAW PACKBLIBS := $(ROOTCLIBS) $(SYSLIBS) -ELIBS:= MONITOR STEERBase ESD AOD CDB STEER RAWDatabase RAWDatarec RAWDatasim TPCbase TPCsim TPCrec ITSbase ITSsim ITSrec HLTbase MUONsim MUONrec MUONbase MUONgeometry MUONraw MUONcalib MUONmapping MUONtrigger MUONevaluation MUONcore +ELIBS:= MONITOR \ + TPCbase \ + TPCsim \ + TPCrec \ + HLTbase \ + ITSbase \ + ITSsim \ + ITSrec \ + MUONmapping \ + MUONevaluation \ + MUONsim \ + MUONrec \ + MUONgeometry \ + MUONcalib \ + MUONbase \ + MUONraw \ + RAWDatasim \ + MUONtrigger \ + MUONcore \ + STEER \ + CDB \ + AOD \ + RAWDatarec \ + ESD \ + RAWDatabase \ + STEERBase ifdef DATE_ROOT diff --git a/MONITOR/binalitestproc.pkg b/MONITOR/binalitestproc.pkg index 56f32fabf57..91168a2c10c 100644 --- a/MONITOR/binalitestproc.pkg +++ b/MONITOR/binalitestproc.pkg @@ -6,7 +6,32 @@ EINCLUDE+= TPC ITS RAW PACKBLIBS := $(ROOTCLIBS) $(SYSLIBS) -ELIBS:= MONITOR STEERBase ESD AOD CDB STEER RAWDatabase RAWDatarec RAWDatasim TPCbase TPCsim TPCrec ITSbase ITSsim ITSrec HLTbase MUONsim MUONrec MUONbase MUONgeometry MUONraw MUONcalib MUONmapping MUONtrigger MUONevaluation MUONcore +ELIBS:= MONITOR \ + TPCbase \ + TPCsim \ + TPCrec \ + HLTbase \ + ITSbase \ + ITSsim \ + ITSrec \ + MUONmapping \ + MUONevaluation \ + MUONsim \ + MUONrec \ + MUONgeometry \ + MUONcalib \ + MUONbase \ + MUONraw \ + RAWDatasim \ + MUONtrigger \ + MUONcore \ + STEER \ + CDB \ + AOD \ + RAWDatarec \ + ESD \ + RAWDatabase \ + STEERBase ifdef DATE_ROOT diff --git a/RAW/dateStream.cxx b/RAW/dateStream.cxx index ca1cfc1f30a..c8fbae5bae1 100644 --- a/RAW/dateStream.cxx +++ b/RAW/dateStream.cxx @@ -82,7 +82,7 @@ struct payloadDescriptorStruct { int size; void *data; } *payloadsHead, *payloadsTail; -int lineNo; +int lineNmb; eventGdcIdType currGdcId; unsigned long32 currDetPattern; eventLdcIdType currLdcId; @@ -220,13 +220,13 @@ void getLine( char *line, const int maxSize ) { if ( read == maxSize && line[read] != '\n' ) { fprintf( stderr, "%s: Input line # %d too long (%d chars max)\n", - myName, lineNo, maxSize-1 ); + myName, lineNmb, maxSize-1 ); exit( 1 ); } line[ read ] = 0; DBG_VERBOSE { if ( !( read == 0 && feof( stdin ) ) ) { - printf( "%d) [%3d] \"%s\"", lineNo, read, line ); + printf( "%d) [%3d] \"%s\"", lineNmb, read, line ); } } for ( c = 0; c != read; c++ ) { @@ -359,7 +359,7 @@ void loadBuffer( struct payloadDescriptorStruct * const payload ) { fprintf( stderr, "%s: line:%d payload file \"%s\" not found or not readable, errno:%d. ", myName, - lineNo, + lineNmb, payload->fileName, errno ); perror( "System-dependent error " ); @@ -369,7 +369,7 @@ void loadBuffer( struct payloadDescriptorStruct * const payload ) { fprintf( stderr, "%s: line:%d Failed to malloc for payload file \"%s\" size:%d errno:%d ", myName, - lineNo, + lineNmb, payload->fileName, payload->size, errno ); @@ -380,7 +380,7 @@ void loadBuffer( struct payloadDescriptorStruct * const payload ) { fprintf( stderr, "%s: line:%d Failed to read payload file \"%s\" size:%d requested:1 got:%d feof:%s ferror:%s errno:%d ", myName, - lineNo, + lineNmb, payload->fileName, payload->size, bytesRead, @@ -442,7 +442,7 @@ void loadPayload( const char *fileName ) { fprintf( stderr, "%s: line:%d payload file \"%s\" not found or not readable, errno:%d. ", myName, - lineNo, + lineNmb, fileName, errno ); perror( "System-dependent error " ); @@ -452,7 +452,7 @@ void loadPayload( const char *fileName ) { fprintf( stderr, "%s: line:%d Failed to seek payload file \"%s\" errno:%d ", myName, - lineNo, + lineNmb, fileName, errno ); perror( "System-dependent error " ); @@ -462,7 +462,7 @@ void loadPayload( const char *fileName ) { fprintf( stderr, "%s: line:%d Failed to get file \"%s\" size size:%d errno:%d ", myName, - lineNo, + lineNmb, fileName, payload->size, errno ); @@ -490,7 +490,7 @@ void loadPayload( const char *fileName ) { int b, n; printf( "%d) Payload \"%s\" loaded at %p\n", - lineNo, + lineNmb, fileName, (void*)payload ); if ( bufferData ) { @@ -650,7 +650,7 @@ void loadPayload( const char *fileName ) { } else { DBG_VERBOSE printf( "%d) Payload \"%s\" already loaded at %p\n", - lineNo, + lineNmb, fileName, (void*)payload ); } @@ -679,7 +679,7 @@ void parseEquipment( char * const line ) { p = line; while ( (keyword = strtok_r( p, " \t", &p )) != NULL ) { DBG_VERBOSE printf( "%d) Equipment - Keyword:\"%s\"\n", - lineNo, + lineNmb, keyword ); if ( strcasecmp( "id", keyword ) == 0 ) { char *idNum; @@ -688,19 +688,19 @@ void parseEquipment( char * const line ) { fprintf( stderr, "%s: line:%d EQUIPMENT declaration, ID needed", myName, - lineNo ); + lineNmb ); exit( 1 ); } if ( sscanf( idNum, "%d", &currEquipmentId ) != 1 ) { fprintf( stderr, "%s: line:%d EQUIPMENT declaration, numeric ID needed (%s)", myName, - lineNo, + lineNmb, idNum ); exit( 1 ); } DBG_VERBOSE printf( "%d) EQUIPMENT - ID:%d\n", - lineNo, + lineNmb, currEquipmentId ); } else if ( strncasecmp( "pay", keyword, 3 ) == 0 ) { char *fileName; @@ -709,17 +709,17 @@ void parseEquipment( char * const line ) { fprintf( stderr, "%s line:%d Payload without filename found\n", myName, - lineNo ); + lineNmb ); exit( 1 ); } DBG_VERBOSE printf( "%d) Equipment - Payload:\"%s\"\n", - lineNo, + lineNmb, fileName ); if ( payloadFound ) { fprintf( stderr, "%s line:%d Payload with multiple filenames found\n", myName, - lineNo ); + lineNmb ); exit( 1 ); } loadPayload( fileName ); @@ -728,7 +728,7 @@ void parseEquipment( char * const line ) { fprintf( stderr, "%s: line:%d Equipment declaration, unknown keyword \"%s\"\n", myName, - lineNo, + lineNmb, keyword ); exit( 1 ); } @@ -737,7 +737,7 @@ void parseEquipment( char * const line ) { fprintf( stderr, "%s: line:%d Equipment without payload found\n", myName, - lineNo ); + lineNmb ); exit( 1 ); } @@ -764,19 +764,19 @@ void parseGdc( char * const line ) { fprintf( stderr, "%s: line:%d GDC declaration, ID needed", myName, - lineNo ); + lineNmb ); exit( 1 ); } if ( sscanf( idNum, "%d", (int*)&currGdcId ) != 1 ) { fprintf( stderr, "%s: line:%d GDC declaration, numeric ID needed (%s)", myName, - lineNo, + lineNmb, idNum ); exit( 1 ); } DBG_VERBOSE printf( "%d) GDC - ID:%d\n", - lineNo, + lineNmb, currGdcId ); } else if ( strcasecmp( "DetectorPattern", keyword ) == 0 ) { char *detPattern; @@ -785,25 +785,25 @@ void parseGdc( char * const line ) { fprintf( stderr, "%s: line:%d GDC declaration, DetectorPattern needed", myName, - lineNo ); + lineNmb ); exit( 1 ); } if ( sscanf( detPattern, "%u", &currDetPattern ) != 1 ) { fprintf( stderr, "%s: line:%d GDC declaration, numeric DetectorPattern needed (%s)", myName, - lineNo, + lineNmb, detPattern ); exit( 1 ); } DBG_VERBOSE printf( "%d) GDC - DetectorPattern:%u\n", - lineNo, + lineNmb, currDetPattern ); } else { fprintf( stderr, "%s: line:%d GDC declaration, unknown keyword \"%s\"\n", myName, - lineNo, + lineNmb, keyword ); exit( 1 ); } @@ -823,25 +823,25 @@ void parseLdc( char * const line ) { fprintf( stderr, "%s: line:%d LDC declaration, ID needed", myName, - lineNo ); + lineNmb ); exit( 1 ); } if ( sscanf( idNum, "%d", (int*)&currLdcId ) != 1 ) { fprintf( stderr, "%s: line:%d LDC declaration, numeric ID needed (%s)", myName, - lineNo, + lineNmb, idNum ); exit( 1 ); } DBG_VERBOSE printf( "%d) LDC - ID:%d\n", - lineNo, + lineNmb, currLdcId ); } else { fprintf( stderr, "%s: line:%d LDC declaration, unknown keyword \"%s\"\n", myName, - lineNo, + lineNmb, keyword ); exit( 1 ); } @@ -855,19 +855,19 @@ void parseRules() { currGdcId = HOST_ID_MIN; currDetPattern = 0; - for ( lineNo = 1; !feof( stdin ); lineNo++ ) { + for ( lineNmb = 1; !feof( stdin ); lineNmb++ ) { getLine( line, sizeof(line) ); if ( strlen(line) != 0 ) { char *p; char *keyword; if ( (keyword = strtok_r( line, " \t", &p )) != NULL ) { - DBG_VERBOSE printf( "%d) Keyword:\"%s\"\n", lineNo, keyword ); + DBG_VERBOSE printf( "%d) Keyword:\"%s\"\n", lineNmb, keyword ); if ( strcasecmp( "gdc", keyword ) == 0 ) { if ( workingAs != gdc && workingAs != unknown ) { fprintf( stderr, "%s: line:%d GDC found when working in non-GDC mode (e.g. as a LDC)\n", - myName, lineNo ); + myName, lineNmb ); exit( 1 ); } workingAs = gdc; @@ -880,7 +880,7 @@ void parseRules() { if ( workingAs != gdc && workingAs != ldc && workingAs != unknown ) { fprintf( stderr, "%s: line:%d LDC found when working in non-LDC/GDC mode\n", - myName, lineNo ); + myName, lineNmb ); exit( 1 ); } if ( workingAs == unknown ) workingAs = ldc; @@ -901,7 +901,7 @@ void parseRules() { fprintf( stderr, "%s: line:%d Unexpected EQUIPMENT declaration (LDC or GDC needed first)\n", myName, - lineNo ); + lineNmb ); exit( 1 ); } parseEquipment( p ); @@ -910,19 +910,19 @@ void parseRules() { fprintf( stderr, "%s: line:%d Parse error in \"%s\" unknown keyword\n", myName, - lineNo, + lineNmb, keyword ); exit( 1 ); } } } } while ( !feof( stdin ) ) {} - lineNo -= 2; + lineNmb -= 2; DBG_VERBOSE { printf( "End of parse: %d line%s found\n", - lineNo, - lineNo != 1 ? "s" : "" ); + lineNmb, + lineNmb != 1 ? "s" : "" ); printf( "Working as %s\n", workingAs == gdc ? "GDC" : workingAs == ldc ? "LDC" : diff --git a/cmake/modules/ALICEMacros.cmake b/cmake/modules/ALICEMacros.cmake index d1e5fc30079..8d0044e66bb 100644 --- a/cmake/modules/ALICEMacros.cmake +++ b/cmake/modules/ALICEMacros.cmake @@ -213,13 +213,13 @@ Function (AddExecutable BIN SRCS LIBS) # There are no static libs for external libraries, so we have to filter # here. This is an ugly way how to do it, so this has to be improved. Foreach(_lib ${LIBS}) - If(${_lib} STREQUAL GLU OR ${_lib} STREQUAL XMLParser) + If(${_lib} STREQUAL GLU OR ${_lib} STREQUAL XMLParser OR ${_lib} STREQUAL dim) Set(_ar_libs ${_ar_libs} ${_lib}) - Else(${_lib} STREQUAL GLU OR ${_lib} STREQUAL XMLParser) + Else(${_lib} STREQUAL GLU OR ${_lib} STREQUAL XMLParser OR ${_lib} STREQUAL dim) Set(_ar_libs ${_ar_libs} ${_lib}_a) - EndIf(${_lib} STREQUAL GLU OR ${_lib} STREQUAL XMLParser) + EndIf(${_lib} STREQUAL GLU OR ${_lib} STREQUAL XMLParser OR ${_lib} STREQUAL dim) EndForeach(_lib ${LIBS}) - Target_Link_Libraries(${BIN}_a ${ALIROOT_LIBRARIES} ${_ar_libs}) + Target_Link_Libraries(${BIN}_a ${ALIROOT_LIBRARIES} ${_ar_libs} ${DMONLIBS}) Install(TARGETS ${BIN}_a DESTINATION ${ALIROOT_INSTALL_DIR}/bin) EndIf(ALICE_STATIC_BUILD) -- 2.39.3