From bdc0aea43e9d0098cf490a9a6c41adde0f0d8c99 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Tue, 17 Oct 2017 12:42:47 +0200 Subject: [PATCH 1/2] Update libnitrokey To latest: v3.1 Signed-off-by: Szczepan Zalega --- libnitrokey | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnitrokey b/libnitrokey index 7d0d0342..91f88b15 160000 --- a/libnitrokey +++ b/libnitrokey @@ -1 +1 @@ -Subproject commit 7d0d03428f90d3f65452eb7035bb715efec87ac8 +Subproject commit 91f88b15f011abe85c85893d1fe50de6c8e4189d From c3464a93f2ce2e8538343af3a5c241069276daeb Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Tue, 17 Oct 2017 13:09:33 +0200 Subject: [PATCH 2/2] Remove nitrokey-app.debug Issue #279 Signed-off-by: Szczepan Zalega --- CMakeLists.txt | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d7c953ec..9ef74d54 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -200,12 +200,6 @@ ADD_EXECUTABLE(nitrokey-app ${GUI_TYPE} ${qrc_files} ) -ADD_EXECUTABLE(nitrokey-app.debug ${GUI_TYPE} - ${nitrokey_app_sources} - ${i18n_resources} - ${qrc_files} -) - OPTION(ERROR_ON_WARNING "Stop compilation on warning found (not supported for MSVC)" ON) if (NOT MSVC) set(COMPILE_FLAGS "-Wall -Wno-unused-function -Wcast-qual -Woverloaded-virtual") @@ -213,11 +207,11 @@ if (NOT MSVC) if (ERROR_ON_WARNING) set(COMPILE_FLAGS "${COMPILE_FLAGS} -Werror") endif() - SET_TARGET_PROPERTIES(nitrokey-app nitrokey-app.debug PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS} ) + SET_TARGET_PROPERTIES(nitrokey-app PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS} ) # endif() endif() -INSTALL(TARGETS nitrokey-app nitrokey-app.debug DESTINATION bin) +INSTALL(TARGETS nitrokey-app DESTINATION bin) TARGET_LINK_LIBRARIES(nitrokey-app ${EXTRA_LIBS} @@ -226,14 +220,6 @@ TARGET_LINK_LIBRARIES(nitrokey-app Qt5::Widgets Qt5::Core Qt5::Gui ) -TARGET_LINK_LIBRARIES(nitrokey-app.debug - ${EXTRA_LIBS} - ${NK_LIB}-log -# ${platform_specific_libs} - Qt5::Widgets Qt5::Core Qt5::Gui -) - - # Packaging SET(CPACK_GENERATOR