Commit d15d8565 authored by Mulas, Giacomo's avatar Mulas, Giacomo
Browse files

_really_ fix makefiles and defines for various options

parent 5c917d34

src/cluster/cluster.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -43,9 +43,9 @@ 
#include "../include/algebraic.h"

#include "../include/algebraic.h"

#endif

#endif





#ifdef LAPACK_ILP64

//#ifdef LAPACK_ILP64

#define USE_LAPACK

//#define USE_LAPACK

#endif

//#endif





using namespace std;

using namespace std;

src/make.inc

+10 −7
Original line number Original line Diff line number Diff line
@@ -73,11 +73,12 @@ endif 




# CXXFLAGS defines the default compilation options for the C++ compiler

# CXXFLAGS defines the default compilation options for the C++ compiler

ifndef CXXFLAGS

ifndef CXXFLAGS

ifdef USE_LAPACK

override CXXFLAGS=-O3 -ggdb -pg -coverage -I$(HDF5_INCLUDE) -I$(LAPACK_INCLUDE)

else

override CXXFLAGS=-O3 -ggdb -pg -coverage -I$(HDF5_INCLUDE)

override CXXFLAGS=-O3 -ggdb -pg -coverage -I$(HDF5_INCLUDE)

#override CXXFLAGS=-O3 -I$(HDF5_INCLUDE)

ifdef USE_LAPACK

override CXXFLAGS+= -DUSE_LAPACK -DMKL_ILP64 -DLAPACK_ILP64 

ifdef USE_MKL

override CXXFLAGS+= -DMKL_ILP64 -I$(MKLROOT)/include

endif

endif

endif

endif

endif
@@ -87,9 +88,11 @@ ifndef CXXLDFLAGS 
ifndef HDF5_LIB

ifndef HDF5_LIB

override HDF5_LIB=/usr/lib/x86_64-linux-gnu/hdf5/serial

override HDF5_LIB=/usr/lib/x86_64-linux-gnu/hdf5/serial

endif

endif

override CXXLDFLAGS=-L/usr/lib64 -L$(HDF5_LIB) -lhdf5 $(LAPACK_LDFLAGS) $(LDFLAGS)

override CXXLDFLAGS=-L/usr/lib64 -L$(HDF5_LIB) -lhdf5

#else

ifdef USE_LAPACK

#override CXXLDFLAGS=-L/usr/lib64 -L$(HDF5_LIB) -lhdf5 $(CXXLDFLAGS)

override CXXLDFLAGS+= $(LAPACK_LDFLAGS)

endif

override CXXLDFLAGS+= $(LDFLAGS)

endif

endif





#SOFLAGS defines the additional flags for the c++ compiler to create a shared object file

#SOFLAGS defines the additional flags for the c++ compiler to create a shared object file