Skip to content

Commit

Permalink
Silence icc complaining about openmp option format
Browse files Browse the repository at this point in the history
  • Loading branch information
krab1k committed Jun 9, 2016
1 parent 55b62e6 commit c37680d
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 29 deletions.
50 changes: 25 additions & 25 deletions externals/lhs/Makefile
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
# please change the variables FC and FFLAGS to match your fortran compiler

CC = icc
CFLAGS=-Wall -Wcheck -Wremarks -std=c99 -g -Ofast -ipo -Xhost -wd981 -openmp
ICC_DISABLE_WARNS=-wd11021
sources=$(wildcard *.c)
headers=$(wildcard *.h)
objects=$(sources:.c=.o)
libraries=-mkl -lm -lz

all: $(objects)

gnu: EXTRA_DEFINE=
gnu: CC=gcc
gnu: ICC_DISABLE_WARNS=
gnu: CFLAGS=-Wall -Wextra -std=c99 -pedantic -O3 -march=native -g -gdwarf-3 -fopenmp
gnu: libraries=-lm -lz
gnu: $(objects)


%.o: %.c
$(CC) $(CFLAGS) $(EXTRA_DEFINE) -c $<

clean:
rm -f *.o
# please change the variables FC and FFLAGS to match your fortran compiler

CC = icc
CFLAGS=-Wall -Wcheck -Wremarks -std=c99 -g -Ofast -ipo -Xhost -wd981 -qopenmp
ICC_DISABLE_WARNS=-wd11021
sources=$(wildcard *.c)
headers=$(wildcard *.h)
objects=$(sources:.c=.o)
libraries=-mkl -lm -lz

all: $(objects)

gnu: EXTRA_DEFINE=
gnu: CC=gcc
gnu: ICC_DISABLE_WARNS=
gnu: CFLAGS=-Wall -Wextra -std=c99 -pedantic -O3 -march=native -g -gdwarf-3 -fopenmp
gnu: libraries=-lm -lz
gnu: $(objects)


%.o: %.c
$(CC) $(CFLAGS) $(EXTRA_DEFINE) -c $<

clean:
rm -f *.o
6 changes: 2 additions & 4 deletions src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
# 2013, 2014

CC=icc
#CFLAGS=-Wall -Wextra -std=c99 -pedantic -O3 -march=native -g -gdwarf-3 -fopenmp
CFLAGS=-Wall -Wcheck -Wremarks -std=c99 -g -Ofast -ipo -Xhost -wd981 -openmp
CFLAGS=-Wall -Wcheck -Wremarks -std=c99 -g -Ofast -ipo -Xhost -wd981 -qopenmp
# -wd981 disables warning about operands evaluated in an unspecified order
EXTRA_DEFINE=-DUSE_MKL

Expand All @@ -13,8 +12,7 @@ ICC_DISABLE_WARNS=-wd11021
sources=$(wildcard *.c)
headers=$(wildcard *.h)
objects=$(sources:.c=.o) ../externals/newuoa/*.o ../externals/lhs/*.o
#libraries=-mkl -lz
libraries=-mkl -lm -lz -openmp -lifcore
libraries=-mkl -lm -lz -qopenmp -lifcore
binaries=neemp
manpage=neemp.1

Expand Down

0 comments on commit c37680d

Please sign in to comment.