Use larger icon when resolution is > 1.25 and cleanup code

IB-6150

Signed-off-by: Raul Metsma <raul@metsma.ee>

CMakeLists.txt

@@ -25,17 +25,18 @@ set(CMAKE_INTERPROCEDURAL_OPTIMIZATION YES)
 set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_DEBUG NO)
 
 if(APPLE)
-        set(BUNDLE_NAME qdigidoc4)
-        add_subdirectory( extensions/DigiDocQL )
+    add_subdirectory(extensions/DigiDocQL)
+elseif(WIN32)
+    add_subdirectory(extensions/windows EXCLUDE_FROM_ALL)
 elseif(UNIX)
-        option(ENABLE_KDE "Install KDE service menu (default: TRUE)" TRUE)
-        option(ENABLE_NAUTILUS_EXTENSION "Build Nautilus extension (default: TRUE)" TRUE)
-        if (ENABLE_KDE)
-                add_subdirectory( extensions/kde )
-        endif()
-        if (ENABLE_NAUTILUS_EXTENSION)
-                add_subdirectory( extensions/nautilus )
-        endif()
+    option(ENABLE_KDE "Install KDE service menu (default: TRUE)" TRUE)
+    option(ENABLE_NAUTILUS_EXTENSION "Build Nautilus extension (default: TRUE)" TRUE)
+    if (ENABLE_KDE)
+        add_subdirectory(extensions/kde)
+    endif()
+    if (ENABLE_NAUTILUS_EXTENSION)
+        add_subdirectory(extensions/nautilus)
+    endif()
 endif()
 
 add_subdirectory( common )

client/CMakeLists.txt

@@ -147,11 +147,12 @@ if( APPLE )
 			$<TARGET_FILE_DIR:${PROGNAME}>/../Library/QuickLook )
 	add_custom_target( macdeployqt DEPENDS ${PROGNAME}
 		COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/${PROGNAME}.app/Contents/Frameworks/
-		COMMAND ${_qt5Core_install_prefix}/bin/macdeployqt ${CMAKE_CURRENT_BINARY_DIR}/${PROGNAME}.app
-		COMMAND find $<TARGET_FILE_DIR:${PROGNAME}>/../PlugIns/imageformats -type f -a ! -name libqgif.dylib -a ! -name libqjpeg.dylib -a ! -name libqsvg.dylib -delete
-		COMMAND rm -rf $<TARGET_FILE_DIR:${PROGNAME}>/../PlugIns/bearer
-		COMMAND cp -a /Library/Frameworks/digidocpp.framework $<TARGET_FILE_DIR:${PROGNAME}>/../Frameworks
-		COMMAND rm $<TARGET_FILE_DIR:${PROGNAME}>/../Frameworks/digidocpp.framework/Resources/digidoc-tool
+		COMMAND ${_qt5Core_install_prefix}/bin/macdeployqt $<TARGET_BUNDLE_DIR:${PROGNAME}>
+		COMMAND find $<TARGET_BUNDLE_CONTENT_DIR:${PROGNAME}>/PlugIns/imageformats -type f -a ! -name libqgif.dylib -a ! -name libqjpeg.dylib -a ! -name libqsvg.dylib -delete
+		COMMAND rm -rf $<TARGET_BUNDLE_CONTENT_DIR:${PROGNAME}>/PlugIns/bearer
+		COMMAND cp -a /Library/Frameworks/digidocpp.framework $<TARGET_BUNDLE_CONTENT_DIR:${PROGNAME}>/Frameworks
+		COMMAND rm $<TARGET_BUNDLE_CONTENT_DIR:${PROGNAME}>/Frameworks/digidocpp.framework/Resources/digidoc-tool
+		COMMAND find $<TARGET_BUNDLE_CONTENT_DIR:${PROGNAME}>/Frameworks -name Headers | xargs rm -rf
 		COMMAND ln -sf ../Frameworks/digidocpp.framework/Libraries/libcrypto.dylib
 		    $<TARGET_FILE_DIR:${PROGNAME}>/../Frameworks/libcrypto.1.1.dylib
 		COMMAND ln -sf ../Frameworks/digidocpp.framework/Libraries/libcrypto.dylib
@@ -160,7 +161,6 @@ if( APPLE )
 		    $<TARGET_FILE_DIR:${PROGNAME}>/../Frameworks/libssl.1.1.dylib
 		COMMAND ln -sf ../Frameworks/digidocpp.framework/Libraries/libssl.dylib
 			$<TARGET_FILE_DIR:${PROGNAME}>/../Frameworks/libssl.dylib
-		COMMAND find $<TARGET_FILE_DIR:${PROGNAME}>/../Frameworks -name Headers | xargs rm -rf
 		COMMAND install_name_tool -delete_rpath /Library/Frameworks $<TARGET_FILE:${PROGNAME}>
 	)