Changeset 1045 for trunk/config/analysis.gmk

Timestamp:

May 15, 2009, 12:28:43 PM (15 years ago)

Author:

garnier

Message:

maj en aussi sur CVS

File:

• trunk/config/analysis.gmk (modified) (2 diffs)

trunk/config/analysis.gmk

@@ -15 +15 @@
       # Then we transform to use the -I syntax which is understood by 
       # both g++ and CL.exe compilers :
-      G4ANALYSIS_TMP := $(shell echo "`aida-config --include`")
-      G4ANALYSIS_AIDA_CONFIG_CFLAGS := $(patsubst /I%,-I"%",$(G4ANALYSIS_TMP))
+      G4ANALYSIS_TMP_1 := $(shell echo "`aida-config --include`")
+      G4ANALYSIS_AIDA_CONFIG_CFLAGS := $(patsubst /I%,-I"%",$(G4ANALYSIS_TMP_1))
     else
       G4ANALYSIS_AIDA_CONFIG_CFLAGS := `aida-config --include`
@@ -22 +22 @@
   endif
   ifndef G4ANALYSIS_AIDA_CONFIG_LIBS
-    G4ANALYSIS_AIDA_CONFIG_LIBS := `aida-config --lib`
+    ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
+      # The "aida-config --lib" for VC may return information
+      # by using the Windows /LIBPATH syntax which is not understood
+      # by g++ used by the Geant4 make system to link applications.
+      G4ANALYSIS_TMP_2 := $(shell echo "`aida-config --lib`" | sed -e 's:\\:/:g')
+      G4ANALYSIS_AIDA_CONFIG_LIBS := $(patsubst /LIBPATH:%,'-libpath:'%,$(G4ANALYSIS_TMP_2))
+    else
+      G4ANALYSIS_AIDA_CONFIG_LIBS := `aida-config --lib`
+    endif
   endif
   CPPFLAGS += $(G4ANALYSIS_AIDA_CONFIG_CFLAGS)