Commit 6c95f271 authored by Ethan Coon's avatar Ethan Coon
Browse files

moves std c++11 flag into test makefile, not into config, as kokkos already adds it.

parent 534a81c4
......@@ -31,7 +31,7 @@ CXX ?= g++
MPICC ?= mpicc
MPICXX ?= mpic++
CXXFLAGS += -g -Wall -Wshadow -std=c++11
CXXFLAGS += -Wall -Wshadow
STD_LIB_ROOT = /usr
......
......@@ -6,6 +6,8 @@ FC = mpifort
CXX = mpicxx
CC = mpicc
CXXFLAGS = -std=c++11 -g
include $(ELM_BASE)/config/Makefile.config
TESTS = test_CanopyHydrology_kern1_single \
......
/* ---------------------------------------------
Makefile constructed configuration:
Tue Jun 18 16:28:56 EDT 2019
Tue Jun 18 16:44:18 EDT 2019
----------------------------------------------*/
#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)
#error "Do not include KokkosCore_config.h directly; include Kokkos_Macros.hpp instead."
......
......@@ -86,6 +86,9 @@ $(EXE1): $(KOKKOS_CPP_DEPENDS) $(OBJ1) $(KOKKOS_LINK_DEPENDS)
# @echo "NETCDF_FLAGS = $(NETCDF_FLAGS)"
# @echo "KOKKOS_LIBS = $(KOKKOS_LIBS)"
# @echo "EXE = $(EXE1)"
# @echo "CXXFLAGS = $(CXXFLAGS)"
# @echo "KOKKOS_CXXFLAGS = $(KOKKOS_CXXFLAGS)"
# @echo "KOKKOS_CPPFLAGS = $(KOKKOS_CPPFLAGS)"
$(LINK) $(OBJ1) $(NETCDF_FLAGS) $(KOKKOS_LDFLAGS) $(KOKKOS_LIBS) $(CXX_LD_FLAGS) -o $(EXE1)
build2: links $(EXE2)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment