From 66ac83482f3b6d0e5aa5f121f806fbc0902fd8ed Mon Sep 17 00:00:00 2001 From: Radovan Bast Date: Sun, 6 Sep 2015 14:37:38 +0200 Subject: [PATCH] s/minimum_required_version/minimum_cmake_version/ --- test/cc_cblas/cmake/autocmake.cfg | 2 +- test/cc_clapack/cmake/autocmake.cfg | 2 +- test/cxx/cmake/autocmake.cfg | 2 +- test/cxx_custom/cmake/autocmake.cfg | 2 +- test/extra_cmake_options/cmake/autocmake.cfg | 2 +- test/fc/cmake/autocmake.cfg | 2 +- test/fc_blas/cmake/autocmake.cfg | 2 +- test/fc_git_info/cmake/autocmake.cfg | 2 +- test/fc_int64/cmake/autocmake.cfg | 2 +- test/fc_lapack/cmake/autocmake.cfg | 2 +- test/fc_mpi/cmake/autocmake.cfg | 2 +- test/fc_omp/cmake/autocmake.cfg | 2 +- test/python_interpreter/cmake/autocmake.cfg | 2 +- test/python_interpreter_custom/cmake/autocmake.cfg | 2 +- test/python_libs/cmake/autocmake.cfg | 2 +- test/python_libs_custom/cmake/autocmake.cfg | 2 +- update.py | 12 ++++++------ 17 files changed, 22 insertions(+), 22 deletions(-) diff --git a/test/cc_cblas/cmake/autocmake.cfg b/test/cc_cblas/cmake/autocmake.cfg index c6120ef..6a5cc81 100644 --- a/test/cc_cblas/cmake/autocmake.cfg +++ b/test/cc_cblas/cmake/autocmake.cfg @@ -1,6 +1,6 @@ [project] name: example -minimum_required_version: 2.8 +minimum_cmake_version: 2.8 [cc] source: ../../../modules/cc.cmake diff --git a/test/cc_clapack/cmake/autocmake.cfg b/test/cc_clapack/cmake/autocmake.cfg index c6120ef..6a5cc81 100644 --- a/test/cc_clapack/cmake/autocmake.cfg +++ b/test/cc_clapack/cmake/autocmake.cfg @@ -1,6 +1,6 @@ [project] name: example -minimum_required_version: 2.8 +minimum_cmake_version: 2.8 [cc] source: ../../../modules/cc.cmake diff --git a/test/cxx/cmake/autocmake.cfg b/test/cxx/cmake/autocmake.cfg index 3aadfbf..2aba82c 100644 --- a/test/cxx/cmake/autocmake.cfg +++ b/test/cxx/cmake/autocmake.cfg @@ -1,6 +1,6 @@ [project] name: example -minimum_required_version: 2.8 +minimum_cmake_version: 2.8 [cxx] source: ../../../modules/cxx.cmake diff --git a/test/cxx_custom/cmake/autocmake.cfg b/test/cxx_custom/cmake/autocmake.cfg index c1fa304..a9649b0 100644 --- a/test/cxx_custom/cmake/autocmake.cfg +++ b/test/cxx_custom/cmake/autocmake.cfg @@ -1,6 +1,6 @@ [project] name: example -minimum_required_version: 2.8 +minimum_cmake_version: 2.8 [cxx] source: ../../../modules/cxx.cmake diff --git a/test/extra_cmake_options/cmake/autocmake.cfg b/test/extra_cmake_options/cmake/autocmake.cfg index d90ebfc..88fa6fc 100644 --- a/test/extra_cmake_options/cmake/autocmake.cfg +++ b/test/extra_cmake_options/cmake/autocmake.cfg @@ -1,6 +1,6 @@ [project] name: example -minimum_required_version: 2.8 +minimum_cmake_version: 2.8 [cxx] source: ../../../modules/cxx.cmake diff --git a/test/fc/cmake/autocmake.cfg b/test/fc/cmake/autocmake.cfg index 1e9d99f..3605fb3 100644 --- a/test/fc/cmake/autocmake.cfg +++ b/test/fc/cmake/autocmake.cfg @@ -1,6 +1,6 @@ [project] name: example -minimum_required_version: 2.8 +minimum_cmake_version: 2.8 [fc] source: ../../../modules/fc.cmake diff --git a/test/fc_blas/cmake/autocmake.cfg b/test/fc_blas/cmake/autocmake.cfg index 64b49de..edd659e 100644 --- a/test/fc_blas/cmake/autocmake.cfg +++ b/test/fc_blas/cmake/autocmake.cfg @@ -1,6 +1,6 @@ [project] name: example -minimum_required_version: 2.8 +minimum_cmake_version: 2.8 [fc] source: ../../../modules/fc.cmake diff --git a/test/fc_git_info/cmake/autocmake.cfg b/test/fc_git_info/cmake/autocmake.cfg index 4c248c5..c1d62bb 100644 --- a/test/fc_git_info/cmake/autocmake.cfg +++ b/test/fc_git_info/cmake/autocmake.cfg @@ -1,6 +1,6 @@ [project] name: example -minimum_required_version: 2.8 +minimum_cmake_version: 2.8 [fc] source: ../../../modules/fc.cmake diff --git a/test/fc_int64/cmake/autocmake.cfg b/test/fc_int64/cmake/autocmake.cfg index 2c9aaab..f4f956a 100644 --- a/test/fc_int64/cmake/autocmake.cfg +++ b/test/fc_int64/cmake/autocmake.cfg @@ -1,6 +1,6 @@ [project] name: example -minimum_required_version: 2.8 +minimum_cmake_version: 2.8 [fc] source: ../../../modules/fc.cmake diff --git a/test/fc_lapack/cmake/autocmake.cfg b/test/fc_lapack/cmake/autocmake.cfg index 64b49de..edd659e 100644 --- a/test/fc_lapack/cmake/autocmake.cfg +++ b/test/fc_lapack/cmake/autocmake.cfg @@ -1,6 +1,6 @@ [project] name: example -minimum_required_version: 2.8 +minimum_cmake_version: 2.8 [fc] source: ../../../modules/fc.cmake diff --git a/test/fc_mpi/cmake/autocmake.cfg b/test/fc_mpi/cmake/autocmake.cfg index e046a70..63d7997 100644 --- a/test/fc_mpi/cmake/autocmake.cfg +++ b/test/fc_mpi/cmake/autocmake.cfg @@ -1,6 +1,6 @@ [project] name: example -minimum_required_version: 2.8 +minimum_cmake_version: 2.8 [fc] source: ../../../modules/fc.cmake diff --git a/test/fc_omp/cmake/autocmake.cfg b/test/fc_omp/cmake/autocmake.cfg index 0d91049..877000e 100644 --- a/test/fc_omp/cmake/autocmake.cfg +++ b/test/fc_omp/cmake/autocmake.cfg @@ -1,6 +1,6 @@ [project] name: example -minimum_required_version: 2.8 +minimum_cmake_version: 2.8 [fc] source: ../../../modules/fc.cmake diff --git a/test/python_interpreter/cmake/autocmake.cfg b/test/python_interpreter/cmake/autocmake.cfg index a53b5bd..86cf1c1 100644 --- a/test/python_interpreter/cmake/autocmake.cfg +++ b/test/python_interpreter/cmake/autocmake.cfg @@ -1,6 +1,6 @@ [project] name: example -minimum_required_version: 2.8 +minimum_cmake_version: 2.8 [cxx] source: ../../../modules/cxx.cmake diff --git a/test/python_interpreter_custom/cmake/autocmake.cfg b/test/python_interpreter_custom/cmake/autocmake.cfg index a53b5bd..86cf1c1 100644 --- a/test/python_interpreter_custom/cmake/autocmake.cfg +++ b/test/python_interpreter_custom/cmake/autocmake.cfg @@ -1,6 +1,6 @@ [project] name: example -minimum_required_version: 2.8 +minimum_cmake_version: 2.8 [cxx] source: ../../../modules/cxx.cmake diff --git a/test/python_libs/cmake/autocmake.cfg b/test/python_libs/cmake/autocmake.cfg index 278d7f4..d1230c5 100644 --- a/test/python_libs/cmake/autocmake.cfg +++ b/test/python_libs/cmake/autocmake.cfg @@ -1,6 +1,6 @@ [project] name: example -minimum_required_version: 2.8 +minimum_cmake_version: 2.8 [cxx] source: ../../../modules/cxx.cmake diff --git a/test/python_libs_custom/cmake/autocmake.cfg b/test/python_libs_custom/cmake/autocmake.cfg index 278d7f4..d1230c5 100644 --- a/test/python_libs_custom/cmake/autocmake.cfg +++ b/test/python_libs_custom/cmake/autocmake.cfg @@ -1,6 +1,6 @@ [project] name: example -minimum_required_version: 2.8 +minimum_cmake_version: 2.8 [cxx] source: ../../../modules/cxx.cmake diff --git a/update.py b/update.py index d5c2694..6b19767 100644 --- a/update.py +++ b/update.py @@ -180,7 +180,7 @@ def gen_setup(config, relative_path): # ------------------------------------------------------------------------------ -def gen_cmakelists(project_name, minimum_required_version, relative_path, modules): +def gen_cmakelists(project_name, minimum_cmake_version, relative_path, modules): """ Generate CMakeLists.txt. """ @@ -189,7 +189,7 @@ def gen_cmakelists(project_name, minimum_required_version, relative_path, module s.append(autogenerated_notice()) s.append('\n# set minimum cmake version') - s.append('cmake_minimum_required(VERSION %s FATAL_ERROR)' % minimum_required_version) + s.append('cmake_minimum_required(VERSION %s FATAL_ERROR)' % minimum_cmake_version) s.append('\n# project name') s.append('project(%s)' % project_name) @@ -362,11 +362,11 @@ def main(argv): sys.exit(-1) project_name = config.get('project', 'name') - if not config.has_option('project', 'minimum_required_version'): - sys.stderr.write("ERROR: you have to specify the minimum_required_version for CMake\n") + if not config.has_option('project', 'minimum_cmake_version'): + sys.stderr.write("ERROR: you have to specify the minimum_cmake_version for CMake\n") sys.stderr.write(" in autocmake.cfg under [project]\n") sys.exit(-1) - minimum_required_version = config.get('project', 'minimum_required_version') + minimum_cmake_version = config.get('project', 'minimum_cmake_version') # get relative path from setup.py script to this directory relative_path = os.path.relpath(os.path.abspath('.'), project_root) @@ -376,7 +376,7 @@ def main(argv): # create CMakeLists.txt print('- generating CMakeLists.txt') - s = gen_cmakelists(project_name, minimum_required_version, relative_path, modules) + s = gen_cmakelists(project_name, minimum_cmake_version, relative_path, modules) with open(os.path.join(project_root, 'CMakeLists.txt'), 'w') as f: f.write('%s\n' % '\n'.join(s))