[Cbench-sf-devel] SF.net SVN: cbench: [313] trunk/cbench/make.def

[<son...@us...>]

Revision: 313
          http://cbench.svn.sourceforge.net/cbench/?rev=313&view=rev
Author:   sonicsoft70
Date:     2008-04-30 09:40:12 -0700 (Wed, 30 Apr 2008)

Log Message:
-----------
update the fftw lib handling a bit, still crufty though

by default we look for mpicc,mpicxx,etc. in
$(MPIHOME)/bin/. added a variable that can be set in
the environment, MPIBINNAME, which will set our
compile wrapper path to $(MPIHOME)/$(MPIBINNAME)/
instead. toss and redstorm have compile scripts in
places like bin64 vs bin for some things

Modified Paths:
--------------
    trunk/cbench/make.def

Modified: trunk/cbench/make.def
===================================================================
--- trunk/cbench/make.def	2008-04-29 19:50:02 UTC (rev 312)
+++ trunk/cbench/make.def	2008-04-30 16:40:12 UTC (rev 313)
@@ -39,9 +39,13 @@
 BENCH_HOME = $(CBENCHOME)
 BENCH_TEST = $(CBENCHTEST)
 COMPILER=$(COMPILERCOLLECTION)
-MPICH = $(MPIHOME)
 
-BUILD_PATH = $(MPICH)/bin/
+ifndef MPIBINNAME
+  BUILD_PATH = $(MPIHOME)/bin/
+else
+  BUILD_PATH = $(MPIHOME)/$(MPIBINNAME)/
+endif
+
 CC = $(BUILD_PATH)mpicc
 CCC = $(BUILD_PATH)mpicxx
 CXX = $(BUILD_PATH)mpicxx
@@ -51,7 +55,7 @@
 # for sure. This would be a nice thing for configure.... :)
 #F77 = $(BUILD_PATH)mpif90
 F90 = $(BUILD_PATH)mpif90
-INCLUDES = -I$(MPICH)/include
+INCLUDES = -I$(MPIHOME)/include
 
 ###### Compiler specific general configs
 ifeq ($(COMPILER),intel)
@@ -192,8 +196,8 @@
 
 ifndef FFTWLIB
   ifdef FFTW_LIB
-  	FFTWLIB=$(FFTW_LIB)
-  	FFTWINCLUDE=$(FFTW_LIB)/../include
+  	FFTWLIB=-Wl,-rpath,$(FFTW_LIB) -L$(FFTW_LIB)
+  	FFTWINCLUDE=$(FFTW_INCLUDE)
   else
     ifdef MKL_LIB
 	  FFTWLIB = -Wl,-rpath,$(MKL_LIB) -L$(MKL_LIB) -lmkl_lapack
@@ -242,7 +246,7 @@
   endif
 
   ifeq ($(COMPILER),intel32)
-  INCLUDES = -I$(MPICH)/include
+  INCLUDES = -I$(MPIHOME)/include
   COMMON_FLAGS = -Wl,-melf_i386
   OPTFLAGS = -O3
   MPILIB =


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.