Require exclude listing of SEMSDevEnv.cmake, remove load_ci_sems_dev_…

…env.sh (#482)

The logic that resulted in the SEMSDevEnv.cmake file getting picked up was a
little too magical.  Therefore, this change is to require that you explictily
list cmake/std/sems/SEMSDevEnv.cmake in the Trilinos_CONFIGURE_OPTIONS_FILE
argument.  This also got rid of the StdDevEnvs.cmake file and gets rid of that
appraoch.  Having to list a single file in Trilinos_CONFIGURE_OPTIONS_FILE is
not that big of a deal and it is explicit with no magic.

I also got rid of the script load_ci_sems_dev_env.sh because it just soruces
load_sems_env.sh with no arguments by default anyway and we will maintain that
going forward.  This just reduces clutter.

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()

cmake/ctest/drivers/sems_ci/single_ci_iter.sh

@@ -9,7 +9,7 @@ TRILINOS_DIR=`readlink -f ${DRIVER_SCRIPT_DIR}/../../../..`
 echo "TRILINOS_DIR='${TRILINOS_DIR}'"
 
 source /etc/bashrc
-source $TRILINOS_DIR/cmake/load_ci_sems_dev_env.sh
+source $TRILINOS_DIR/cmake/load_sems_dev_env.sh
 
 export CTEST_DASHBOARD_ROOT=$PWD
 

cmake/ctest/drivers/sems_ci/single_ci_iter_aao_crf450.sh

@@ -10,7 +10,7 @@ TRILINOS_DIR=`readlink -f ${DRIVER_SCRIPT_DIR}/../../../..`
 echo "TRILINOS_DIR='${TRILINOS_DIR}'"
 
 source /etc/bashrc
-source $TRILINOS_DIR/cmake/load_ci_sems_dev_env.sh
+source $TRILINOS_DIR/cmake/load_sems_dev_env.sh
 export PATH=/home/vera_env/common_tools/cmake-master-20170917-214d0ce/bin:$PATH
 
 export CTEST_DASHBOARD_ROOT=$PWD

cmake/load_sems_dev_env.sh

@@ -138,9 +138,3 @@ module load $sems_superlu_and_version_default
 if [ "${TRILINOS_SEMS_DEV_ENV_VERBOSE}" == "1" ] ; then
   module list
 fi
-
-#
-# D) Remember the loaded SEMS Dev Env
-#
-
-export TRILINOS_SEMS_DEV_ENV_LOADED="$TRILINOS_SEMS_DEV_ENV_TO_LOAD"

cmake/std/sems/SEMSDevEnv.cmake

@@ -65,16 +65,20 @@ SET(SEMS_MPI_VERSION $ENV{SEMS_MPI_VERSION})
 #PRINT_VAR(SEMS_MPI_VERSION)
 
 #
-# Define helper function for finding the serial version of a TPL of this is a
-# serial build.
+# Define helper function for finding the serial (non-MPI) version of a TPL for
+# as serial build
 #
 # Called as:
 #
 #   SEMS_SELECT_TPL_ROOT_DIR( <semsTPLName> <tplRootDirOut>
 #     [PARALLEL_EXT <parallelExt> SERIAL_EXT <serialExt>] )
 #
-# If PARALLEL_EXT <parallelExt> SERIAL_EXT <serialExt> is not given, then it
-# is assumed that <parallelExt>=parallel and <serialExt>=base.
+# If arguments:
+#
+#   PARALLEL_EXT <parallelExt> SERIAL_EXT <serialExt>
+#
+# are not given, then it is assumed that <parallelExt>=parallel and
+# <serialExt>=base.
 #
 FUNCTION(SEMS_SELECT_TPL_ROOT_DIR  SEMS_TPL_NAME  TPL_ROOT_DIR_OUT)
 

cmake/std/sems/checkin-test-sems.sh

@@ -93,7 +93,7 @@ fi
 
 if [ "$TRILINOS_CHECKIN_TEST_SEMS_SKIP_MODULE_LOAD" == "" ] ; then
   export TRILINOS_SEMS_DEV_ENV_VERBOSE=1
-  source $TRILINOS_DIR/cmake/load_ci_sems_dev_env.sh ""
+  source $TRILINOS_DIR/cmake/load_sems_dev_env.sh ""
   # NOTE: Above, must pass empty arg "" or bash will pass in "$@" which is
   # bad!
 else
@@ -113,7 +113,7 @@ echo "
 # All of the options needed for the --default-builds
 # MPI_RELEASE_DEBUG_SHARED_PT are in project-checkin-test-config.py so no need
 # to set them here.  Also note that the SEMS env will be read in automatically
-# because load_ci_sems_dev_env.sh was sourced above.
+# because load_sems_dev_env.sh was sourced above.
 
 echo "
 -DZoltan2_OrderingScotch_MPI_4_DISABLE=TRUE
@@ -136,19 +136,21 @@ echo "
 " > MPI_RELEASE_DEBUG_SHARED_PT_COMPLEX.config
 
 echo "
--DTrilinos_CONFIGURE_OPTIONS_FILE:STRING=cmake/std/MpiReleaseDebugSharedPtSettings.cmake,cmake/std/BasicCiTestingSettings.cmake
+-DTrilinos_CONFIGURE_OPTIONS_FILE:STRING=cmake/std/MpiReleaseDebugSharedPtSettings.cmake,cmake/std/BasicCiTestingSettings.cmake,cmake/std/sems/SEMSDevEnv.cmake
 -DTrilinos_ENABLE_DEBUG=OFF
 -DTrilinos_ENABLE_SECONDARY_TESTED_CODE=OFF
 " > MPI_RELEASE_SHARED_PT.config
 
 echo "
+-DTrilinos_CONFIGURE_OPTIONS_FILE:STRING=cmake/std/sems/SEMSDevEnv.cmake
 -DTPL_ENABLE_MPI=OFF
 -DCMAKE_BUILD_TYPE=RELEASE
 -DBUILD_SHARED_LIBS=ON
 -DTrilinos_ENABLE_SECONDARY_TESTED_CODE=OFF
 " > SERIAL_RELEASE_SHARED_PT.config
 
 echo "
+-DTrilinos_CONFIGURE_OPTIONS_FILE:STRING=cmake/std/sems/SEMSDevEnv.cmake
 -DTPL_ENABLE_MPI=ON
 -DCMAKE_BUILD_TYPE=RELEASE
 -DTrilinos_ENABLE_DEBUG=ON
@@ -159,6 +161,7 @@ echo "
 " > MPI_RELEASE_DEBUG_SHARED_ST.config
 
 echo "
+-DTrilinos_CONFIGURE_OPTIONS_FILE:STRING=cmake/std/sems/SEMSDevEnv.cmake
 -DTPL_ENABLE_MPI=OFF
 -DCMAKE_BUILD_TYPE=RELEASE
 -DBUILD_SHARED_LIBS=ON

cmake/unload_sems_dev_env.sh

@@ -17,4 +17,3 @@
 #
 
 module purge 
-export TRILINOS_SEMS_DEV_ENV_LOADED=

project-checkin-test-config.py

@@ -34,7 +34,7 @@
         'default-builds': [
 
             ('MPI_RELEASE_DEBUG_SHARED_PT', [
-                '-DTrilinos_CONFIGURE_OPTIONS_FILE:STRING=cmake/std/MpiReleaseDebugSharedPtSettings.cmake,cmake/std/BasicCiTestingSettings.cmake',
+                '-DTrilinos_CONFIGURE_OPTIONS_FILE:STRING=cmake/std/MpiReleaseDebugSharedPtSettings.cmake,cmake/std/BasicCiTestingSettings.cmake,cmake/std/sems/SEMSDevEnv.cmake',
                 ]),
 
             ## Options for the SERIAL_RELEASE build.