diff --git a/test/cc_cblas/cmake/autocmake.cfg b/test/cc_cblas/cmake/autocmake.cfg index 6a5cc81..d90fc83 100644 --- a/test/cc_cblas/cmake/autocmake.cfg +++ b/test/cc_cblas/cmake/autocmake.cfg @@ -1,6 +1,6 @@ [project] name: example -minimum_cmake_version: 2.8 +min_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 6a5cc81..d90fc83 100644 --- a/test/cc_clapack/cmake/autocmake.cfg +++ b/test/cc_clapack/cmake/autocmake.cfg @@ -1,6 +1,6 @@ [project] name: example -minimum_cmake_version: 2.8 +min_cmake_version: 2.8 [cc] source: ../../../modules/cc.cmake diff --git a/test/cxx/cmake/autocmake.cfg b/test/cxx/cmake/autocmake.cfg index 2aba82c..7e392cb 100644 --- a/test/cxx/cmake/autocmake.cfg +++ b/test/cxx/cmake/autocmake.cfg @@ -1,6 +1,6 @@ [project] name: example -minimum_cmake_version: 2.8 +min_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 a9649b0..b6fe55c 100644 --- a/test/cxx_custom/cmake/autocmake.cfg +++ b/test/cxx_custom/cmake/autocmake.cfg @@ -1,6 +1,6 @@ [project] name: example -minimum_cmake_version: 2.8 +min_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 88fa6fc..ce3bf11 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_cmake_version: 2.8 +min_cmake_version: 2.8 [cxx] source: ../../../modules/cxx.cmake diff --git a/test/fc/cmake/autocmake.cfg b/test/fc/cmake/autocmake.cfg index 3605fb3..813b62d 100644 --- a/test/fc/cmake/autocmake.cfg +++ b/test/fc/cmake/autocmake.cfg @@ -1,6 +1,6 @@ [project] name: example -minimum_cmake_version: 2.8 +min_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 edd659e..d1bc157 100644 --- a/test/fc_blas/cmake/autocmake.cfg +++ b/test/fc_blas/cmake/autocmake.cfg @@ -1,6 +1,6 @@ [project] name: example -minimum_cmake_version: 2.8 +min_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 c1d62bb..a1e1d12 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_cmake_version: 2.8 +min_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 f4f956a..922c59c 100644 --- a/test/fc_int64/cmake/autocmake.cfg +++ b/test/fc_int64/cmake/autocmake.cfg @@ -1,6 +1,6 @@ [project] name: example -minimum_cmake_version: 2.8 +min_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 edd659e..d1bc157 100644 --- a/test/fc_lapack/cmake/autocmake.cfg +++ b/test/fc_lapack/cmake/autocmake.cfg @@ -1,6 +1,6 @@ [project] name: example -minimum_cmake_version: 2.8 +min_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 63d7997..7c3e118 100644 --- a/test/fc_mpi/cmake/autocmake.cfg +++ b/test/fc_mpi/cmake/autocmake.cfg @@ -1,6 +1,6 @@ [project] name: example -minimum_cmake_version: 2.8 +min_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 877000e..5f3475e 100644 --- a/test/fc_omp/cmake/autocmake.cfg +++ b/test/fc_omp/cmake/autocmake.cfg @@ -1,6 +1,6 @@ [project] name: example -minimum_cmake_version: 2.8 +min_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 86cf1c1..d77d2cf 100644 --- a/test/python_interpreter/cmake/autocmake.cfg +++ b/test/python_interpreter/cmake/autocmake.cfg @@ -1,6 +1,6 @@ [project] name: example -minimum_cmake_version: 2.8 +min_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 86cf1c1..d77d2cf 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_cmake_version: 2.8 +min_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 d1230c5..df9c15d 100644 --- a/test/python_libs/cmake/autocmake.cfg +++ b/test/python_libs/cmake/autocmake.cfg @@ -1,6 +1,6 @@ [project] name: example -minimum_cmake_version: 2.8 +min_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 d1230c5..df9c15d 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_cmake_version: 2.8 +min_cmake_version: 2.8 [cxx] source: ../../../modules/cxx.cmake diff --git a/update.py b/update.py index 0bad7af..528b2b1 100644 --- a/update.py +++ b/update.py @@ -180,7 +180,7 @@ def gen_setup(config, relative_path): # ------------------------------------------------------------------------------ -def gen_cmakelists(project_name, minimum_cmake_version, relative_path, modules): +def gen_cmakelists(project_name, min_cmake_version, relative_path, modules): """ Generate CMakeLists.txt. """ @@ -189,7 +189,7 @@ def gen_cmakelists(project_name, minimum_cmake_version, relative_path, modules): s.append(autogenerated_notice()) s.append('\n# set minimum cmake version') - s.append('cmake_minimum_required(VERSION %s FATAL_ERROR)' % minimum_cmake_version) + s.append('cmake_minimum_required(VERSION %s FATAL_ERROR)' % min_cmake_version) s.append('\n# project name') s.append('project(%s)' % project_name) @@ -377,11 +377,11 @@ def main(argv): sys.exit(-1) project_name = config.get('project', 'name') - if not config.has_option('project', 'minimum_cmake_version'): - sys.stderr.write("ERROR: you have to specify the minimum_cmake_version for CMake\n") + if not config.has_option('project', 'min_cmake_version'): + sys.stderr.write("ERROR: you have to specify the min_cmake_version for CMake\n") sys.stderr.write(" in autocmake.cfg under [project]\n") sys.exit(-1) - minimum_cmake_version = config.get('project', 'minimum_cmake_version') + min_cmake_version = config.get('project', 'min_cmake_version') # get relative path from setup.py script to this directory relative_path = os.path.relpath(os.path.abspath('.'), project_root) @@ -391,7 +391,7 @@ def main(argv): # create CMakeLists.txt print('- generating CMakeLists.txt') - s = gen_cmakelists(project_name, minimum_cmake_version, relative_path, modules) + s = gen_cmakelists(project_name, min_cmake_version, relative_path, modules) with open(os.path.join(project_root, 'CMakeLists.txt'), 'w') as f: f.write('%s\n' % '\n'.join(s))