diff options
| author | Szczepan Zalega <szczepan@nitrokey.com> | 2018-08-23 18:05:11 +0200 |
|---|---|---|
| committer | Szczepan Zalega <szczepan@nitrokey.com> | 2018-08-23 18:05:11 +0200 |
| commit | dee6ebe5d0a9ea5d555852011d219a66d8746b0e (patch) | |
| tree | 28fbfde73768edbf3bcd43b843e61360fd36df63 /meson.build | |
| parent | ef171dfd5bf23da606597a251c327ad2c52ec7b8 (diff) | |
| download | libnitrokey-names_clash.tar.gz libnitrokey-names_clash.tar.bz2 | |
Fix potential names clash with client projectsnames_clash
Nitrokey App was failing to build due to name clash with version.h file. Renamed.
Tested CMake, QMake and Meson build.
Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meson.build b/meson.build index 600be6d..bbe6830 100644 --- a/meson.build +++ b/meson.build @@ -46,13 +46,13 @@ version_data.set('PROJECT_VERSION_MINOR', version_minor) # We don't want to substitute it by noop version_data.set('PROJECT_VERSION_GIT', '@VCS_TAG@') version_cc_in = configure_file( - input : 'version.cc.in', - output : 'version.cc.in', + input : 'version-libnk.cc.in', + output : 'version-libnk.cc.in', configuration : version_data, ) version_cc = vcs_tag( input : version_cc_in, - output : 'version.cc', + output : 'version-libnk.cc', fallback : 'v@0@'.format(meson.project_version()), ) libnitrokey = library( @@ -90,7 +90,7 @@ install_headers( 'libnitrokey/log.h', 'libnitrokey/LongOperationInProgressException.h', 'libnitrokey/misc.h', - 'libnitrokey/version.h', + 'libnitrokey/version-libnk.h', 'libnitrokey/NitrokeyManager.h', 'libnitrokey/stick10_commands_0.8.h', 'libnitrokey/stick10_commands.h', |