diff -uNr qdigidoc4-4.2.1/client/CMakeLists.txt qdigidoc4-4.2.1p/client/CMakeLists.txt --- qdigidoc4-4.2.1/client/CMakeLists.txt 2019-04-05 15:09:01.000000000 +0300 +++ qdigidoc4-4.2.1p/client/CMakeLists.txt 2019-05-15 19:01:43.313870772 +0300 @@ -2,18 +2,18 @@ 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_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 +#) include_directories( ${CMAKE_SOURCE_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 fonts/fonts.qrc ${CMAKE_CURRENT_BINARY_DIR}/tr.qrc ${CMAKE_CURRENT_BINARY_DIR}/TSL.qrc ) +qt5_add_resources( SOURCES images/images.qrc fonts/fonts.qrc ${CMAKE_CURRENT_BINARY_DIR}/tr.qrc TSL.qrc ) qt5_wrap_ui( SOURCES MainWindow.ui dialogs/AddRecipients.ui dialogs/CertificateHistory.ui dialogs/CertificateDetails.ui dialogs/FirstRun.ui dialogs/KeyDialog.ui dialogs/MobileDialog.ui dialogs/MobileProgress.ui dialogs/PinPopup.ui dialogs/PinUnblock.ui dialogs/RoleAddressDialog.ui dialogs/SettingsDialog.ui dialogs/SignatureDialog.ui dialogs/Updater.ui dialogs/WaitDialog.ui dialogs/WarningDialog.ui widgets/Accordion.ui widgets/AccordionTitle.ui widgets/AddressItem.ui widgets/CardWidget.ui widgets/ContainerPage.ui widgets/FileItem.ui diff -uNr qdigidoc4-4.2.1/common/CMakeLists.txt qdigidoc4-4.2.1p/common/CMakeLists.txt --- qdigidoc4-4.2.1/common/CMakeLists.txt 2019-04-05 15:09:04.000000000 +0300 +++ qdigidoc4-4.2.1p/common/CMakeLists.txt 2019-05-15 19:11:25.954715176 +0300 @@ -45,13 +45,13 @@ if( LAST_CHECK_DAYS ) set_source_files_properties( Configuration.cpp PROPERTIES COMPILE_DEFINITIONS "LAST_CHECK_DAYS=${LAST_CHECK_DAYS}" ) endif() - 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( CONFIG_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/config.qrc ) + #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( CONFIG_SOURCES config.qrc ) target_compile_definitions(qdigidoccommon PUBLIC CONFIG_URL="${CONFIG_URL}") target_sources(qdigidoccommon PRIVATE ${CONFIG_SOURCES} Configuration.cpp ) endif()