diff -urNr qdigidoc-3.13.6-orig/client/CMakeLists.txt qdigidoc-3.13.6/client/CMakeLists.txt
--- qdigidoc-3.13.6-orig/client/CMakeLists.txt 2017-12-20 12:16:52.000000000 +0100
+++ qdigidoc-3.13.6/client/CMakeLists.txt 2018-02-08 19:13:28.618395917 +0100
@@ -1,20 +1,12 @@
set_app_name( PROGNAME qdigidocclient )
-add_executable( TSLDownload TSLDownload.cpp )
-target_link_libraries( TSLDownload Qt5::Network )
-add_custom_command(
- OUTPUT TSL.qrc
- DEPENDS TSLDownload
- COMMAND $<TARGET_FILE:TSLDownload> "${CMAKE_CURRENT_BINARY_DIR}" ${TSL_URL} ${TSL_INCLUDE}
- WORKING_DIRECTORY ${_qt5Core_install_prefix}/bin
-)
add_definitions( -DPKCS11_MODULE="${PKCS11_MODULE}" )
include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/common ${OPENSSL_INCLUDE_DIR} )
configure_file( translations/tr.qrc tr.qrc COPYONLY )
qt5_add_translation( SOURCES translations/en.ts translations/et.ts translations/ru.ts )
-qt5_add_resources( SOURCES images/images.qrc ${CMAKE_CURRENT_BINARY_DIR}/tr.qrc ${CMAKE_CURRENT_BINARY_DIR}/TSL.qrc )
+qt5_add_resources( SOURCES images/images.qrc ${CMAKE_CURRENT_BINARY_DIR}/tr.qrc TSL.qrc )
qt5_wrap_ui( SOURCES MainWindow.ui MobileDialog.ui SettingsDialog.ui SignatureDialog.ui )
if( APPLE )
diff -urNr qdigidoc-3.13.6-orig/common/CMakeLists.txt qdigidoc-3.13.6/common/CMakeLists.txt
--- qdigidoc-3.13.6-orig/common/CMakeLists.txt 2017-12-20 12:16:53.000000000 +0100
+++ qdigidoc-3.13.6/common/CMakeLists.txt 2018-02-08 19:24:03.112803454 +0100
@@ -16,13 +16,7 @@
endif()
add_definitions( -DCONFIG_URL="${CONFIG_URL}" )
list( APPEND SOURCES Configuration.cpp )
- file( DOWNLOAD ${CONFIG_URL} ${CMAKE_CURRENT_BINARY_DIR}/config.json )
- string( REPLACE ".json" ".rsa" RSA_URL ${CONFIG_URL} )
- file( DOWNLOAD ${RSA_URL} ${CMAKE_CURRENT_BINARY_DIR}/config.rsa )
- string( REPLACE ".json" ".pub" PUB_URL ${CONFIG_URL} )
- file( DOWNLOAD ${PUB_URL} ${CMAKE_CURRENT_BINARY_DIR}/config.pub )
- configure_file( config.qrc config.qrc COPYONLY )
- qt5_add_resources( SOURCES ${CMAKE_CURRENT_BINARY_DIR}/config.qrc )
+ qt5_add_resources( SOURCES config.qrc )
endif()
if( WIN32 )