Skip to content

Commit

Permalink
Merge branch '279-libnitrokey_update' into compile_with_qtcreator
Browse files Browse the repository at this point in the history
Issue #279
  • Loading branch information
szszszsz committed Oct 17, 2017
2 parents 7b4cbbf + c3464a9 commit 957c42d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 17 deletions.
18 changes: 2 additions & 16 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -200,24 +200,18 @@ 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")
# IF(NOT APPLE)
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}
Expand All @@ -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
Expand Down

0 comments on commit 957c42d

Please sign in to comment.