-
Notifications
You must be signed in to change notification settings - Fork 572
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Require exclude listing of SEMSDevEnv.cmake, remove load_ci_sems_dev_env.sh (#482) #2374
Require exclude listing of SEMSDevEnv.cmake, remove load_ci_sems_dev_env.sh (#482) #2374
Conversation
…env.sh (trilinos#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.
This is replaced with the "atdm" stuff (see TRIL-171).
Status Flag 'Pre-Test Inspection' - Auto Inspected - Inspection Is Not Necessary for this Pull Request. |
For those that like to use -C instead of -DTrilinos_CONFIGURE_OPTIONS_FILE now you can read this in with -C. But you will need to provide the entire path and can't provide a relative path like with -DTrilinos_CONFIGURE_OPTIONS_FILE:STIRNG=<rel-path>.
Status Flag 'Pull Request AutoTester' - Testing Jenkins Projects: Pull Request Auto Testing STARTING (click to expand)Build InformationTest Name: Trilinos_autotester_test
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_4.9.3
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_4.8.4
Jenkins Parameters
Using Repos:
Pull Request Author: bartlettroscoe |
Status Flag 'Pre-Test Inspection' - Auto Inspected - Inspection Is Not Necessary for this Pull Request. |
Status Flag 'Pull Request AutoTester' - Testing Jenkins Projects: Pull Request Auto Testing STARTING (click to expand)Build InformationTest Name: Trilinos_autotester_test
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_4.9.3
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_4.8.4
Jenkins Parameters
Using Repos:
Pull Request Author: bartlettroscoe |
Status Flag 'Pull Request AutoTester' - Jenkins Testing: all Jobs PASSED Pull Request Auto Testing has PASSED (click to expand)Build InformationTest Name: Trilinos_autotester_test
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_4.9.3
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_4.8.4
Jenkins Parameters
|
Status Flag 'Pre-Merge Inspection' - - This Pull Request Requires Inspection... The code must be inspected by a member of the Team before Testing/Merging |
All Jobs Finished; status = PASSED, However Inspection must be performed before merge can occur... |
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 explicitly
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.
I also made it so you can pull in
SEMSDevEnv.cmake
with-C <full_path>/SEMSDevEnv.cmake
instead of with-DTrilinos_CONFIGURE_OPTIONS_FILE:STRING=<rel_path>/SEMSDevEnv.cmake
.Related issues: