Add DESKTOP_APP_USE_PACKAGED support for Windows

external/auto_updates/CMakeLists.txt

@@ -7,7 +7,7 @@
 add_library(external_auto_updates INTERFACE IMPORTED GLOBAL)
 add_library(desktop-app::external_auto_updates ALIAS external_auto_updates)
 
-if (WIN32)
+if (WIN32 AND NOT DESKTOP_APP_USE_PACKAGED)
     add_subdirectory(lzma)
     target_link_libraries(external_auto_updates
     INTERFACE

external/minizip/CMakeLists.txt

@@ -12,7 +12,7 @@ if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
     pkg_check_modules(MINIZIP REQUIRED IMPORTED_TARGET minizip)
 
     target_link_libraries(external_minizip INTERFACE PkgConfig::MINIZIP)
-elseif (NOT WIN32)
+elseif (NOT WIN32 OR DESKTOP_APP_USE_PACKAGED_LAZY)
     add_library(external_minizip_bundled STATIC)
     init_target(external_minizip_bundled "(external)")
 

external/ranges/CMakeLists.txt

@@ -15,12 +15,12 @@ else()
     INTERFACE
         ${third_party_loc}/range-v3/include
     )
-endif()
 
-if (WIN32)
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
         target_compile_options(external_ranges
         INTERFACE
             /experimental:preprocessor # need for range-v3 see https://github.com/ericniebler/range-v3#supported-compilers
             /wd5105 # needed for `/experimental:preprocessor`, suppressing C5105 "macro expansion producing 'defined' has undefined behavior"
         )
+    endif()
 endif()

external/rlottie/CMakeLists.txt

@@ -124,7 +124,7 @@ else()
         )
     endif()
 
-    if (WIN32)
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
         target_compile_options(external_rlottie
         PRIVATE
             /w44244 # 'initializing': conversion from 'double' to 'float'

init_target.cmake

@@ -5,7 +5,7 @@
 # https://github.com/desktop-app/legal/blob/master/LEGAL
 
 set(MAXIMUM_CXX_STANDARD cxx_std_20)
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     set(MAXIMUM_CXX_STANDARD cxx_std_17)
 endif()
 
@@ -26,7 +26,7 @@ function(init_target target_name) # init_target(my_target folder_name)
     else()
         target_compile_features(${target_name} PUBLIC ${MAXIMUM_CXX_STANDARD})
     endif()
-    if (WIN32)
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
         set_target_properties(${target_name} PROPERTIES
             MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
     endif()
@@ -45,7 +45,7 @@ function(init_target target_name) # init_target(my_target folder_name)
             XCODE_ATTRIBUTE_LLVM_LTO $<IF:$<CONFIG:Debug>,NO,YES>
         )
     endif()
-    if (WIN32 OR DESKTOP_APP_ENABLE_IPO_OPTIMIZATIONS)
+    if (DESKTOP_APP_ENABLE_IPO_OPTIMIZATIONS)
         set_target_properties(${target_name} PROPERTIES
             INTERPROCEDURAL_OPTIMIZATION_RELEASE True
             INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO True

options_win.cmake

@@ -13,8 +13,9 @@ INTERFACE
     UNICODE
     _UNICODE
 )
-target_compile_options(common_options
+if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-INTERFACE
+    target_compile_options(common_options
+    INTERFACE
         /permissive-
         # /Qspectre
         /W1
@@ -27,12 +28,37 @@ INTERFACE
         /wd4068 # Disable "warning C4068: unknown pragma"
         /Zc:wchar_t- # don't tread wchar_t as builtin type
         /Zi
-)
+    )
 
-target_link_options(common_options
+    target_link_options(common_options
-INTERFACE
+    INTERFACE
         $<IF:$<CONFIG:Debug>,/NODEFAULTLIB:LIBCMT,/DEBUG;/OPT:REF>
-)
+    )
+elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    target_compile_definitions(common_options
+    INTERFACE
+        WINVER=0x0601
+        _WIN32_WINNT=0x0601
+    )
+
+    target_compile_options(common_options
+    INTERFACE
+        -fpermissive
+    )
+
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+        target_compile_options(common_options
+        INTERFACE
+            -fms-extensions
+            -femulated-tls
+        )
+
+        target_link_options(common_options
+        INTERFACE
+            -fuse-ld=lld
+        )
+    endif()
+endif()
 
 target_link_libraries(common_options
 INTERFACE

variables.cmake

@@ -36,7 +36,7 @@ option(DESKTOP_APP_USE_PACKAGED_FONTS "Use preinstalled fonts instead of bundled
 option(DESKTOP_APP_USE_HUNSPELL_ONLY "Disable system spellchecker and use bundled Hunspell only. (For debugging purposes)" OFF)
 option(DESKTOP_APP_USE_ENCHANT "Use Enchant instead of bundled Hunspell. (Linux only)" OFF)
 
-option(DESKTOP_APP_ENABLE_IPO_OPTIMIZATIONS "Enable IPO build optimizations." OFF)
+option(DESKTOP_APP_ENABLE_IPO_OPTIMIZATIONS "Enable IPO build optimizations." ${WIN32})
 if (DESKTOP_APP_ENABLE_IPO_OPTIMIZATIONS AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     message(WARNING "Clang cannot build Qt applications with IPO enabled due to upstream bug: https://bugreports.qt.io/browse/QTBUG-61710.")
     set(DESKTOP_APP_ENABLE_IPO_OPTIMIZATIONS OFF)