Skip to content
Snippets Groups Projects
Commit 57323555 authored by Wang, Ruonan's avatar Wang, Ruonan
Browse files

merge

parent bbd349e2
No related branches found
No related tags found
1 merge request!8Integrate groupless
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
DATAMAN_LOCATION=/Users/w4g/Dropbox/lib/DataMan DATAMAN_LOCATION=/Users/w4g/Dropbox/lib/DataMan
MPICOMPILER=mpic++ MPICOMPILER=mpic++
export DYLD_LIBRARY_PATH=$DATAMAN_LOCATION/lib:$DYLD_LIBRARY_PATH
if [ "$(uname)" == "Darwin" ]; then if [ "$(uname)" == "Darwin" ]; then
CCOMPILER=g++-6 CCOMPILER=g++-6
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
BASE_NAME=helloDataManReader BASE_NAME=helloDataManReader
CC=g++ # Compiling with defaults CC=g++-6 # Compiling with defaults
MPICC=mpic++ MPICC=mpic++
INC= INC=
LIB= LIB=
...@@ -20,8 +20,8 @@ INC+= -I$(ADIOS_DIR)/include ...@@ -20,8 +20,8 @@ INC+= -I$(ADIOS_DIR)/include
#DATAMAN #DATAMAN
DATAMAN_LOC=/Users/w4g/Dropbox/lib/DataMan DATAMAN_LOC=/Users/w4g/Dropbox/lib/DataMan
INC+= -I$(DATAMAN_LOC)/include INC+= -I$(DATAMAN_LOC)/include
LIB+= -L$(DATAMAN_LOC)/lib -ldataman LIB+= -Wl,-rpath,$(DATAMAN_LOC)/lib -L$(DATAMAN_LOC)/lib -ldataman
LIB_NOMPI+= -L$(DATAMAN_LOC)/lib -ldataman LIB_NOMPI+= -Wl,-rpath,$(DATAMAN_LOC)/lib -L$(DATAMAN_LOC)/lib -ldataman
#COMPILER FLAGS #COMPILER FLAGS
CFLAGS=-Wall -O0 -g -Wpedantic -std=c++11 CFLAGS=-Wall -O0 -g -Wpedantic -std=c++11
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
BASE_NAME=helloDataManWriter BASE_NAME=helloDataManWriter
CC=g++ # Compiling with defaults CC=g++-6 # Compiling with defaults
MPICC=mpic++ MPICC=mpic++
INC= INC=
LIB= LIB=
...@@ -20,8 +20,8 @@ INC+= -I$(ADIOS_DIR)/include ...@@ -20,8 +20,8 @@ INC+= -I$(ADIOS_DIR)/include
#DATAMAN #DATAMAN
DATAMAN_LOC=/Users/w4g/Dropbox/lib/DataMan DATAMAN_LOC=/Users/w4g/Dropbox/lib/DataMan
INC+= -I$(DATAMAN_LOC)/include INC+= -I$(DATAMAN_LOC)/include
LIB+= -L$(DATAMAN_LOC)/lib -ldataman LIB+= -Wl,-rpath,$(DATAMAN_LOC)/lib -L$(DATAMAN_LOC)/lib -ldataman
LIB_NOMPI+= -L$(DATAMAN_LOC)/lib -ldataman LIB_NOMPI+= -Wl,-rpath,$(DATAMAN_LOC)/lib -L$(DATAMAN_LOC)/lib -ldataman
#COMPILER FLAGS #COMPILER FLAGS
CFLAGS=-Wall -O0 -g -Wpedantic -std=c++11 CFLAGS=-Wall -O0 -g -Wpedantic -std=c++11
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment