diff --git a/CMakeLists.txt b/CMakeLists.txt index bf7a0294d1..6d36809819 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,6 @@ # We set the project name in a separate file so CTest scripts can use it. INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/ProjectName.cmake) -SET(Seacas_ENABLE_CXX11_DEFAULT ON) SET(Seacas_ENABLE_Zoltan_DEFAULT ON) SET(TRIBITS_HIDE_DEPRECATED_INCLUDE_DIRECTORIES_OVERRIDE TRUE) diff --git a/README.md b/README.md index 04ac66677c..af95904b01 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ manually as detailed in | Variable | Values | Default | Description | |-----------------|:---------------:|:-------:|-------------| | INSTALL_PATH | path to install | pwd | Root of install path; default is current location | -| COMPILER | clang, gnu, intel, ibm | gnu | What compiler should be used for non-parallel build. Must have C++-14 capability. | +| COMPILER | clang, gnu, intel, ibm nvidia | gnu | What compiler should be used for non-parallel build. Must have C++-17 capability. | | MPI | YES, NO | NO | If YES, then build parallel capability | | FORCE | YES, NO | NO | Force downloading and building even if lib is already installed. | | BUILD | YES, NO | YES | Should TPLs be built and installed. | diff --git a/TPL/compiler.sh b/TPL/compiler.sh index 4bb7e1e2fe..929fa181a9 100644 --- a/TPL/compiler.sh +++ b/TPL/compiler.sh @@ -59,4 +59,10 @@ else export CC=xlc export CXX=xlc fi + if [ "$COMPILER" == "nvidia" ] + then + export CXX="nvcc -x c++" + expoort CC=nvcc + fi + fi