Merge branch '482-simplify-sems-dev-env' into develop (#482)

trilinos · Mar 14, 2018 · d64af4c · d64af4c
2 parents cfd3edf + 1188e55
commit d64af4c
Show file tree

Hide file tree

Showing 17 changed files with 31 additions and 582 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -85,9 +85,6 @@ SET(${PROJECT_NAME}_ENABLE_INSTALL_CMAKE_CONFIG_FILES_DEFAULT ON)
 SET(${PROJECT_NAME}_ENABLE_CPACK_PACKAGING_DEFAULT ON)
 # Don't allow disabled subpackages to be excluded from tarball
 SET(${PROJECT_NAME}_EXCLUDE_DISABLED_SUBPACKAGES_FROM_DISTRIBUTION_DEFAULT FALSE)
-# Set up to automatically use standard dev envs by default
-SET(${PROJECT_NAME}_CONFIGURE_OPTIONS_FILE_APPEND
-  "${CMAKE_CURRENT_LIST_DIR}/cmake/StdDevEnvs.cmake" )
 
 # Do all of the processing for this Tribits project
 TRIBITS_PROJECT()

diff --git a/cmake/StdDevEnvs.cmake b/cmake/StdDevEnvs.cmake
diff --git a/cmake/ctest/drivers/ATTB/ATTBDevEnv.cmake b/cmake/ctest/drivers/ATTB/ATTBDevEnv.cmake
diff --git a/cmake/ctest/drivers/ATTB/attb_cuda_config_base.sh b/cmake/ctest/drivers/ATTB/attb_cuda_config_base.sh
diff --git a/cmake/ctest/drivers/ATTB/attb_cuda_config_for_drekar.sh b/cmake/ctest/drivers/ATTB/attb_cuda_config_for_drekar.sh