From a9a66f907b1cd4fb55754fd9f9d459e64b942dd4 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Tue, 10 Oct 2017 18:45:11 +0200 Subject: Bump version to 3.1 Signed-off-by: Szczepan Zalega --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8cb0fdc..87a0c46 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,11 +28,11 @@ IF (UNIX) ENDIF() project(libnitrokey) -SET(PROJECT_VERSION "3.0-alpha") +SET(PROJECT_VERSION "3.1") set(CMAKE_CXX_STANDARD 14) set(LIBNK_VERSION_MAJOR 3) # reminder: incompatible API changes -set(LIBNK_VERSION_MINOR 0) # add functionality in a backwards-compatible manner +set(LIBNK_VERSION_MINOR 1) # add functionality in a backwards-compatible manner set(LIBNK_VERSION_PATCH 0) # make backwards-compatible bug fixes set(LIBNK_VERSION ${LIBNK_VERSION_MAJOR}.${LIBNK_VERSION_MINOR}.${LIBNK_VERSION_PATCH} ) -- cgit v1.2.3 From bb7e087979d9150b8ab8d28ffccc43a3eaddab35 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Tue, 10 Oct 2017 18:47:16 +0200 Subject: Remove -log library leftovers Signed-off-by: Szczepan Zalega --- CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 87a0c46..246edbd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,7 +91,6 @@ ENDIF() IF (NOT LIBNITROKEY_STATIC) add_library(nitrokey SHARED ${SOURCE_FILES}) - add_library(nitrokey-log SHARED ${SOURCE_FILES}) SET(LIBNAME nitrokey) ELSE() add_library(nitrokey-static STATIC ${SOURCE_FILES}) @@ -103,8 +102,6 @@ target_link_libraries(${LIBNAME} hidapi-libusb) set_target_properties(${LIBNAME} PROPERTIES VERSION ${LIBNK_VERSION} SOVERSION ${LIBNK_VERSION_MAJOR} ) -set_target_properties(${LIBNAME}-log PROPERTIES VERSION ${LIBNK_VERSION} - SOVERSION ${LIBNK_VERSION_MAJOR} ) OPTION(ERROR_ON_WARNING "Stop compilation on warning found (not supported for MSVC)" ON) if (NOT MSVC) @@ -126,7 +123,6 @@ ENDIF() file(GLOB LIB_INCLUDES "include/*.h") install (FILES ${LIB_INCLUDES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libnitrokey) install (TARGETS ${LIBNAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) -install (TARGETS ${LIBNAME}-log DESTINATION ${CMAKE_INSTALL_LIBDIR}) include_directories(unittest/Catch/include) -- cgit v1.2.3 From d7b408f96f196fcd03f90131a3dbcbb1f11a0728 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Tue, 10 Oct 2017 18:48:44 +0200 Subject: Allow to enable compilation of general and offline tests separately Signed-off-by: Szczepan Zalega --- CMakeLists.txt | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 246edbd..643e630 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,6 @@ include(GNUInstallDirs) OPTION(LIBNITROKEY_STATIC "Build libnitrokey statically" FALSE) -OPTION(COMPILE_TESTS "Compile tests" FALSE) IF (NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE RelWithDebInfo) ENDIF() @@ -124,14 +123,21 @@ file(GLOB LIB_INCLUDES "include/*.h") install (FILES ${LIB_INCLUDES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libnitrokey) install (TARGETS ${LIBNAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) +OPTION(COMPILE_TESTS "Compile tests" FALSE) +OPTION(COMPILE_OFFLINE_TESTS "Compile offline tests" FALSE) + +IF(COMPILE_OFFLINE_TESTS OR COMPILE_TESTS) + include_directories(unittest/Catch/include) + add_library(catch SHARED unittest/catch_main.cpp ) +ENDIF() -include_directories(unittest/Catch/include) -add_library(catch STATIC unittest/catch_main.cpp ) -add_executable (test_offline unittest/test_offline.cc) -target_link_libraries (test_offline ${EXTRA_LIBS} ${LIBNAME}-log catch) -#run with 'make test' or 'ctest' -include (CTest) -add_test (runs test_offline) +IF(COMPILE_OFFLINE_TESTS) + add_executable (test_offline unittest/test_offline.cc) + target_link_libraries (test_offline ${EXTRA_LIBS} ${LIBNAME} catch) + #run with 'make test' or 'ctest' + include (CTest) + add_test (runs test_offline) +ENDIF() IF (COMPILE_TESTS) #needs connected PRO device for success @@ -158,7 +164,6 @@ ENDIF() - #SET(CPACK_GENERATOR # "DEB;RPM") # build a CPack driven installer package -- cgit v1.2.3