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 /libnitrokey.pro | |
| parent | ef171dfd5bf23da606597a251c327ad2c52ec7b8 (diff) | |
| download | libnitrokey-dee6ebe5d0a9ea5d555852011d219a66d8746b0e.tar.gz libnitrokey-dee6ebe5d0a9ea5d555852011d219a66d8746b0e.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 'libnitrokey.pro')
| -rw-r--r-- | libnitrokey.pro | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libnitrokey.pro b/libnitrokey.pro index 75ce4a2..b8accba 100644 --- a/libnitrokey.pro +++ b/libnitrokey.pro @@ -13,6 +13,8 @@ QMAKE_TARGET_PRODUCT = libnitrokey QMAKE_TARGET_DESCRIPTION = Communicate with Nitrokey stick devices in a clean and easy manner QMAKE_TARGET_COPYRIGHT = Copyright (c) 2015-2018 Nitrokey UG +message($$PWD) + HEADERS = \ $$PWD/hidapi/hidapi/hidapi.h \ $$PWD/libnitrokey/command.h \ @@ -25,7 +27,7 @@ HEADERS = \ $$PWD/libnitrokey/dissect.h \ $$PWD/libnitrokey/LibraryException.h \ $$PWD/libnitrokey/log.h \ - $$PWD/libnitrokey/version.h \ + $$PWD/libnitrokey/version-libnk.h \ $$PWD/libnitrokey/LongOperationInProgressException.h \ $$PWD/libnitrokey/misc.h \ $$PWD/libnitrokey/NitrokeyManager.h \ @@ -40,7 +42,7 @@ SOURCES = \ $$PWD/device.cc \ $$PWD/DeviceCommunicationExceptions.cpp \ $$PWD/log.cc \ - $$PWD/version.cc \ + $$PWD/version-libnk.cc \ $$PWD/misc.cc \ $$PWD/NitrokeyManager.cc \ $$PWD/NK_C_API.cc @@ -49,7 +51,7 @@ SOURCES = \ tests { SOURCES += \ $$PWD/unittest/catch_main.cpp \ - $$PWD/unittest/test.cc \ + $$PWD/unittest/test1.cc \ $$PWD/unittest/test2.cc \ $$PWD/unittest/test3.cc \ $$PWD/unittest/test_C_API.cpp \ |