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 /CMakeLists.txt | |
| 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 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 32f75a3..32eb62a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,7 +67,7 @@ set(SOURCE_FILES NK_C_API.h NK_C_API.cc DeviceCommunicationExceptions.cpp - ${CMAKE_CURRENT_BINARY_DIR}/version.cc + ${CMAKE_CURRENT_BINARY_DIR}/version-libnk.cc ) set(BUILD_SHARED_LIBS ON CACHE BOOL "Build all libraries as shared") @@ -133,7 +133,7 @@ IF((NOT ${ADD_GIT_INFO}) OR (${PROJECT_VERSION_GIT_RETURN_CODE})) SET(PROJECT_VERSION_GIT "unknown") MESSAGE(STATUS "Setting Git library version to: " ${PROJECT_VERSION_GIT} ) ENDIF() -configure_file("version.cc.in" "version.cc" @ONLY) +configure_file("version-libnk.cc.in" "version-libnk.cc" @ONLY) file(GLOB LIB_INCLUDES "libnitrokey/*.h" "NK_C_API.h") |