diff options
| author | Frank Schoenmann <[email protected]> | 2017-10-12 18:18:50 +0200 |
|---|---|---|
| committer | Frank Schoenmann <[email protected]> | 2017-10-12 19:16:19 +0200 |
| commit | 16ba9cbe351e4491cc021745a71a47eccc61d19f (patch) | |
| tree | 70c547f8215911e7eff049fcac7b0746ed14fb6b /configure.py | |
| parent | f60b816469ebc3b46aa64dcba0dcdcdb92e87301 (diff) | |
Repair generation of CMakeLists.txt after some files have been moved.
Diffstat (limited to 'configure.py')
| -rwxr-xr-x | configure.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/configure.py b/configure.py index 8c6471fe8..e69da63b9 100755 --- a/configure.py +++ b/configure.py @@ -1625,7 +1625,7 @@ class CmakeGenerator(object): def _write_footer(self, fd, library_link, cli_link, tests_link): fd.write('\n') - fd.write('option(ENABLED_OPTIONAL_WARINIGS "If enabled more strict warinig policy will be used" OFF)\n') + fd.write('option(ENABLED_OPTIONAL_WARINIGS "If enabled more strict warning policy will be used" OFF)\n') fd.write('option(ENABLED_LTO "If enabled link time optimization will be used" OFF)\n\n') fd.write('set(COMPILER_FEATURES_RELEASE %s %s)\n' @@ -1679,12 +1679,13 @@ class CmakeGenerator(object): % tests_link) fd.write('set_target_properties(${PROJECT_NAME}_tests PROPERTIES OUTPUT_NAME botan-test)\n\n') - fd.write('set(CONFIGURATION_FILES configure.py .gitignore .astylerc authors.txt news.rst readme.rst)\n') + fd.write('set(GLOBAL_CONFIGURATION_FILES configure.py .gitignore news.rst readme.rst)\n') + fd.write('file(GLOB_RECURSE CONFIGURATION_FILES src/configs/* )\n') fd.write('file(GLOB_RECURSE DOCUMENTATION_FILES doc/* )\n') fd.write('file(GLOB_RECURSE HEADER_FILES src/*.h )\n') fd.write('file(GLOB_RECURSE INFO_FILES src/lib/*info.txt )\n') fd.write('add_custom_target(CONFIGURATION_DUMMY SOURCES ' + - '${CONFIGURATION_FILES} ${DOCUMENTATION_FILES} ${INFO_FILES} ${HEADER_FILES})\n') + '${GLOBAL_CONFIGURATION_FILES} ${CONFIGURATION_FILES} ${DOCUMENTATION_FILES} ${INFO_FILES} ${HEADER_FILES})\n') def generate(self): library_target_configuration = self._create_target_rules(self._build_paths.lib_sources) |