Rename VERSION to KIWIX_TOOLS_VERSION to avoid collision

pull/326/head
Kelson 7 years ago
parent c6757dd309
commit ca943b9d0b

@ -121,11 +121,7 @@ If you want to uninstall the Kiwix tools:
ninja -C build uninstall
```
<<<<<<< HEAD
Like for the installation, you might need to run the command as `root`
=======
Like for the installation, you might need to run the command as root
>>>>>>> Various README.md improvements
(or using `sudo`).
Docker

@ -5,7 +5,7 @@ project('kiwix-tools', 'cpp',
compiler = meson.get_compiler('cpp')
add_global_arguments('-DVERSION="@0@"'.format(meson.project_version()), language : 'cpp')
add_global_arguments('-DKIWIX_TOOLS_VERSION="@0@"'.format(meson.project_version()), language : 'cpp')
static_linkage = get_option('static-linkage')
if static_linkage

@ -17,16 +17,16 @@
* MA 02110-1301, USA.
*/
#ifndef _KIWIX_TOOL_VERSION_H_
#define _KIWIX_TOOL_VERSION_H_
#ifndef _KIWIX_TOOLS_VERSION_H_
#define _KIWIX_TOOLS_VERSION_H_
#ifndef VERSION
#define VERSION "undefined"
#ifndef KIWIX_TOOLS_VERSION
#define KIWIX_TOOLS_VERSION "undefined"
#endif
void version()
{
std::cout << VERSION << std::endl;
std::cout << KIWIX_TOOLS_VERSION << std::endl;
}
#endif //_KIWIX_TOOL_VERSION_H_
#endif //_KIWIX_TOOLs_VERSION_H_

Loading…
Cancel
Save