Update Autocmake, require CMake 3.0 at least

Author: robertodr

.travis.yml

@@ -120,7 +120,7 @@ script:
 after_success:
   - |
     if [[ "${COVERAGE}" = true ]]; then
-      coveralls -E ".*external.*" -E ".*CMakeFiles.*" -E ".*test/.*.cpp.*" -E ".*src/lebedev/.*.cpp.*" || echo 'coveralls upload failed.'
+      coveralls -E ".*external.*" -E ".*CMakeFiles.*" -E ".*test/.*.cpp.*" || echo 'coveralls upload failed.'
     fi
 
 notifications:

CMakeLists.txt

@@ -2,15 +2,15 @@
 # Copyright (c) 2015-2017 by Radovan Bast, Jonas Juselius, and contributors.
 
 # set minimum cmake version
-cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
 
 # project name
-project(numgrid)
+project(numgrid CXX)
 
 # do not rebuild if rules (compiler flags) change
 set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
 
-# if CMAKE_BUILD_TYPE undefined, we set it to Debug
+# if CMAKE_BUILD_TYPE undefined, we set it to Release
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Release")
 endif()

cmake/autocmake.yml

@@ -1,6 +1,8 @@
 name: numgrid
 
-min_cmake_version: 2.8
+min_cmake_version: 3.0
+
+language: CXX
 
 default_build_type: release
 

cmake/autocmake/generate.py

@@ -118,7 +118,7 @@ def gen_setup(config, default_build_type, relative_path, setup_script_name):
     return s
 
 
-def gen_cmakelists(project_name, min_cmake_version, default_build_type, relative_path, modules):
+def gen_cmakelists(project_name, project_language, min_cmake_version, default_build_type, relative_path, modules):
     """
     Generate CMakeLists.txt.
     """
@@ -132,7 +132,7 @@ def gen_cmakelists(project_name, min_cmake_version, default_build_type, relative
     s.append('cmake_minimum_required(VERSION {0} FATAL_ERROR)'.format(min_cmake_version))
 
     s.append('\n# project name')
-    s.append('project({0})'.format(project_name))
+    s.append('project({0} {1})'.format(project_name, project_language))
 
     s.append('\n# do not rebuild if rules (compiler flags) change')
     s.append('set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)')
@@ -142,9 +142,10 @@ def gen_cmakelists(project_name, min_cmake_version, default_build_type, relative
                               'relwithdebinfo': 'RelWithDebInfo',
                               'minsizerel': 'MinSizeRel'}
 
-    s.append('\n# if CMAKE_BUILD_TYPE undefined, we set it to Debug')
+    _build_type = build_type_capitalized[default_build_type]
+    s.append('\n# if CMAKE_BUILD_TYPE undefined, we set it to {0}'.format(_build_type))
     s.append('if(NOT CMAKE_BUILD_TYPE)')
-    s.append('    set(CMAKE_BUILD_TYPE "{0}")'.format(build_type_capitalized[default_build_type]))
+    s.append('    set(CMAKE_BUILD_TYPE "{0}")'.format(_build_type))
     s.append('endif()')
 
     if len(modules) > 0:

cmake/update.py

@@ -141,6 +141,12 @@ def process_yaml(argv):
         sys.stderr.write("ERROR: project name contains a space\n")
         sys.exit(-1)
 
+    if 'language' in config:
+        project_language = ' '.join(config['language']) if isinstance(config['language'], list) else config['language']
+    else:
+        sys.stderr.write("ERROR: you have to specify the project language(s) in autocmake.yml\n")
+        sys.exit(-1)
+
     if 'min_cmake_version' in config:
         min_cmake_version = config['min_cmake_version']
     else:
@@ -179,7 +185,7 @@ def process_yaml(argv):
 
     # create CMakeLists.txt
     print('- generating CMakeLists.txt')
-    s = gen_cmakelists(project_name, min_cmake_version, default_build_type, relative_path, modules)
+    s = gen_cmakelists(project_name, project_language, min_cmake_version, default_build_type, relative_path, modules)
     with open(os.path.join(project_root, 'CMakeLists.txt'), 'w') as f:
         f.write('{0}\n'.format('\n'.join(s)))