Skip to content
Snippets Groups Projects
Commit cc540278 authored by Dilawar Singh's avatar Dilawar Singh
Browse files

Merge commit 'b4d20b7c'

Conflicts:
	moose-core/CMakeLists.txt
parents 2b8d61d3 b4d20b7c
No related branches found
No related tags found
No related merge requests found
......@@ -273,12 +273,12 @@ endif
# Here we automagically change compilers to deal with MPI.
ifdef USE_MPI
CXX = mpicxx
CXX = mpicxx --std=c++11
# CXX = /usr/local/mvapich2/bin/mpicxx
# PARALLEL_DIR = parallel
# PARALLEL_LIB = parallel/parallel.o
else
CXX = g++
CXX = g++ --std=c++11
# CXX = CC # Choose between Solaris CC and g++ on a Solaris machine
endif
......
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