aboutsummaryrefslogtreecommitdiff
path: root/CMakeLists.txt
Commit message (Collapse)AuthorAge
* Fix potential names clash with client projectsnames_clashSzczepan Zalega2018-08-23
| | | | | | | | 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>
* Bump version to 3.4.1Szczepan Zalega2018-07-18
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Handle build without Git repository infoSzczepan Zalega2018-07-18
| | | | | | | Sets version to "unknown" Fixes #126 Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Add a test to ensure valid C code in the C APIRobin Krahl2018-07-05
| | | | | | | | | | All current tests are written in C++. Therefore C++-only code in the C API might not be detected by the tests. This patch adds a minimal test written in C that only includes the C API header. This should make sure that the C API code is valid. The new test is called `test_minimal.c` and is added to the CMake COMPILE_OFFLINE_TESTS option.
* Move implementation from header back to compilation unitSzczepan Zalega2018-06-19
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Add getters for the library versionRobin Krahl2018-05-25
| | | | | | | CMake generates version.h from version.h.in and sets the major and minor version as specified in CMakeLists.txt and the current git version as returned by `git describe --always`. These values are also added to the C API as NK_get{_major,_minor,}_library_version.
* Implement suggested testsSzczepan Zalega2018-04-19
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Fix compilation warnings for testsSzczepan Zalega2018-04-19
| | | | | | | Cleanup CMakeList a bit as well. Fixes #97 Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Install: use correct source dir for Udev rules installation when included ↵Szczepan Zalega2018-04-11
| | | | | | from another CMake project Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Update version to 3.3Szczepan Zalega2018-04-10
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Allow overriding of udev rules dirDavid Seifert2018-03-13
|
* Make unbundling easierDavid Seifert2018-03-13
|
* Add tests for refreshed devices list and not refreshed in the loopSzczepan Zalega2018-02-28
| | | | | | Add it to CMake Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Initial support for multiple devices with C++ and testSzczepan Zalega2018-02-28
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Install udev file (CMake)Szczepan Zalega2018-01-30
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Try to use system Catch2 if possibleDavid Seifert2018-01-29
|
* Set version to 3.2Szczepan Zalega2018-01-16
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Install NK_C_API.h file to system's includesSzczepan Zalega2018-01-16
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Remove inttypes from build filesSzczepan Zalega2018-01-16
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Add support for pkg-configDavid Seifert2017-12-11
|
* Modernise CMakeDavid Seifert2017-12-11
| | | | | | | | | | | | | | | | * Make indentation uniform * Find libhid via pkg-config on Unix * Use `BUILD_SHARED_LIBS`, which is the idiomatic way to switch between static and shared libraries in CMake. https://cmake.org/cmake/help/v3.0/variable/BUILD_SHARED_LIBS.html * Remove Clang option. To use Clang, pass `CXX=clang++` as an environmental parameter to the CMake call. * Do not enable `-Werror` by default. This just causes unnecessary issues with new compiler releases. https://blog.flameeyes.eu/2009/02/future-proof-your-code-dont-use-werror/
* Switch logging volatile dataSzczepan Zalega2017-10-11
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Make Debug build by default on MacOSSzczepan Zalega2017-10-11
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Allow to enable compilation of general and offline tests separatelySzczepan Zalega2017-10-10
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Remove -log library leftoversSzczepan Zalega2017-10-10
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Bump version to 3.1Szczepan Zalega2017-10-10
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Merge branch 'test_organize'Szczepan Zalega2017-10-10
|\ | | | | | | | | | | Improve test organization Disable CRC check Improve log
| * Remove libnitrokey-log and add a switch to choose version insteadSzczepan Zalega2017-10-04
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* | Enable offline test on all instancesSzczepan Zalega2017-10-07
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* | Add C++ offline tests and set them defaultSzczepan Zalega2017-10-07
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* | Fix install commandSzczepan Zalega2017-10-07
| | | | | | | | | | | | | | | | | | Install binaries Copy all headers to own directory Closes #70 Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* | Build shared library by defaultSzczepan Zalega2017-10-07
| | | | | | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* | Set SONAME and use semantic versioningSzczepan Zalega2017-10-07
| | | | | | | | | | | | Closes #69 Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* | build: use GNUInstallDirsIgor Gnatenko2017-10-07
|/ | | | | | | This simplifies package maintainers life a lot so they don't have to patch buildsystem at all. It just works. Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
* Adjust code to make compilation under MSVC 2017Szczepan Zalega2017-06-28
|
* Add C++ tests for some current issuesSzczepan Zalega2017-06-27
| | | | | | | | Issues: https://github.com/Nitrokey/nitrokey-storage-firmware/issues/36 https://github.com/Nitrokey/nitrokey-storage-firmware/issues/31 Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Do not abort compilation at all on OSXSzczepan Zalega2017-04-04
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Do not abort compilation on warnings in hid.c on OSXSzczepan Zalega2017-04-03
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Do not fail compilation on testsSzczepan Zalega2017-03-31
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Do not check for warnings on 3rd-party code - hidapiSzczepan Zalega2017-03-31
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Show warnings during the compilation and treat warnings as errorSzczepan Zalega2017-03-31
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Use proper frameworks with cmake and OSXSzczepan Zalega2017-03-20
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Do not link hidapi under OSXSzczepan Zalega2017-03-14
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Add tested Travis build configuration. Set proper hidapi url.Szczepan Zalega2017-03-11
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Count lifetime instances of device communication exceptionSzczepan Zalega2017-03-11
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Comment: use clang with TSANSzczepan Zalega2017-03-11
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Build debug-log-free library for increased securitySzczepan Zalega2017-03-11
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Compiles on MXE, but not working on WindowsSzczepan Zalega2017-03-11
| | | | Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
* Adjust for compilation on Visual Studio 2017Szczepan Zalega2017-03-11
| | | | Building works however tests are not. Possibly linking with original hidapi solution would work.
* Test compilation under windowsSzczepan Zalega2017-03-11
|