s/defaults/override/

This commit is contained in:
Radovan Bast 2015-10-05 15:43:19 +02:00
parent 883fc0cc9f
commit 09903e4034
5 changed files with 6 additions and 6 deletions

View File

@ -6,7 +6,7 @@ min_cmake_version: 2.8
source: ../../../modules/cxx.cmake
[boost]
defaults: {'major': 1, 'minor': 48, 'patch': 0}
override: {'major': 1, 'minor': 48, 'patch': 0}
source: ../../../modules/boost/boost.cmake
[default_build_paths]

View File

@ -6,7 +6,7 @@ min_cmake_version: 2.8
source: ../../../modules/cxx.cmake
[boost]
defaults: {'major': 1, 'minor': 59, 'patch': 0, 'components': 'chrono;timer;system'}
override: {'major': 1, 'minor': 59, 'patch': 0, 'components': 'chrono;timer;system'}
source: ../../../modules/boost/boost.cmake
[default_build_paths]

View File

@ -9,7 +9,7 @@ source: ../../../modules/cxx.cmake
source: ../../../modules/mpi.cmake
[boost]
defaults: {'major': 1, 'minor': 59, 'patch': 0, 'components': 'mpi;serialization'}
override: {'major': 1, 'minor': 59, 'patch': 0, 'components': 'mpi;serialization'}
source: ../../../modules/boost/boost.cmake
[default_build_paths]

View File

@ -12,7 +12,7 @@ source: ../../../modules/python_interpreter.cmake
source: ../../../modules/python_libs.cmake
[boost]
defaults: {'major': 1, 'minor': 56, 'patch': 0, 'components': 'python'}
override: {'major': 1, 'minor': 56, 'patch': 0, 'components': 'python'}
source: ../../../modules/boost/boost.cmake
[default_build_paths]

View File

@ -288,8 +288,8 @@ def fetch_modules(config, relative_path):
sys.stderr.write("ERROR: %s does not exist\n" % src)
sys.exit(-1)
if config.has_option(section, 'defaults'):
defaults = ast.literal_eval(config.get(section, 'defaults'))
if config.has_option(section, 'override'):
defaults = ast.literal_eval(config.get(section, 'override'))
else:
defaults = {}