From 09903e4034ea65c6f480ee8967e202c638f11200 Mon Sep 17 00:00:00 2001 From: Radovan Bast Date: Mon, 5 Oct 2015 15:43:19 +0200 Subject: [PATCH] s/defaults/override/ --- test/boost_header_only/cmake/autocmake.cfg | 2 +- test/boost_libs/cmake/autocmake.cfg | 2 +- test/boost_mpi_libs/cmake/autocmake.cfg | 2 +- test/boost_python_libs/cmake/autocmake.cfg | 2 +- update.py | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/boost_header_only/cmake/autocmake.cfg b/test/boost_header_only/cmake/autocmake.cfg index f67ddec..e76db41 100644 --- a/test/boost_header_only/cmake/autocmake.cfg +++ b/test/boost_header_only/cmake/autocmake.cfg @@ -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] diff --git a/test/boost_libs/cmake/autocmake.cfg b/test/boost_libs/cmake/autocmake.cfg index ac17fe3..9ff39de 100644 --- a/test/boost_libs/cmake/autocmake.cfg +++ b/test/boost_libs/cmake/autocmake.cfg @@ -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] diff --git a/test/boost_mpi_libs/cmake/autocmake.cfg b/test/boost_mpi_libs/cmake/autocmake.cfg index 222e715..4847c0d 100644 --- a/test/boost_mpi_libs/cmake/autocmake.cfg +++ b/test/boost_mpi_libs/cmake/autocmake.cfg @@ -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] diff --git a/test/boost_python_libs/cmake/autocmake.cfg b/test/boost_python_libs/cmake/autocmake.cfg index 0088d4d..6f9a212 100644 --- a/test/boost_python_libs/cmake/autocmake.cfg +++ b/test/boost_python_libs/cmake/autocmake.cfg @@ -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] diff --git a/update.py b/update.py index 9a55f23..f3e2054 100644 --- a/update.py +++ b/update.py @@ -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 = {}