This repository has been archived by the owner on Sep 30, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 52
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
With this commit the system for locating the site config file is as follows: 1. During the configure process cmake will create a file site_config.py in the build/python/ert_gui directory, the content of this file will be: config_file = "${SITE_CONFIG_FILE}" where ${SITE_CONFIG_FILE} is the variable set during the configure step. The generated file will be installed alongside the gert_main module. 2. The gert_main module tries to import the site_config module and uses the config_file setting from there. 3. If the ERT_SITE_CONFIG environment variable has been set that will take presedence. With these changes it is not necessary for the frontend script to set the ERT_SITE_CONFIG variable. Conflicts: devel/python/python/ert_gui/gert_main.py
- Loading branch information
1 parent
732fb0a
commit f56eb56
Showing
3 changed files
with
35 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
config_file = "${SITE_CONFIG_FILE}" |