From 6f2769cb57c06d4ee10532b80482b8610aae4f2b Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Fri, 14 Oct 2016 13:59:37 +0200 Subject: CMake: Set clang as compiler and set linking flags Signed-off-by: Szczepan Zalega --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 39c0c34..803c465 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,13 @@ cmake_minimum_required(VERSION 3.5) project(libnitrokey) +set(CMAKE_CXX_COMPILER "/usr/bin/clang++-3.8" CACHE string "clang++ compiler" FORCE) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wno-gnu-variable-sized-type-not-at-end -g3" ) +SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lhidapi-libusb" ) + +include_directories(include unittest/Catch/include) set(SOURCE_FILES include/command.h -- cgit v1.2.1 From 5e72941919f19c43c1cd7f79c5cb913caf2705e4 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Fri, 14 Oct 2016 14:01:10 +0200 Subject: Test C API in C++ (Catch) Signed-off-by: Szczepan Zalega --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 803c465..eedfd35 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,6 +28,8 @@ set(SOURCE_FILES log.cc misc.cc NitrokeyManager.cc - NK_C_API.cc include/CommandFailedException.h include/LibraryException.h) + NK_C_API.cc include/CommandFailedException.h include/LibraryException.h + unittest/test_C_API.cpp + unittest/catch_main.cpp) add_executable(libnitrokey ${SOURCE_FILES}) \ No newline at end of file -- cgit v1.2.1