Use return to decrease indentation in cmake files

external/dbusmenu_qt/CMakeLists.txt

@@ -16,10 +16,10 @@ if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_QT6)
 
     if (dbusmenu-qt5_FOUND)
         target_link_libraries(external_dbusmenu_qt INTERFACE dbusmenu-qt5)
+        return()
     endif()
 endif()
 
-if (NOT dbusmenu-qt5_FOUND)
 add_library(external_dbusmenu_qt_bundled STATIC)
 init_target(external_dbusmenu_qt_bundled "(external)")
 
@@ -79,4 +79,3 @@ if (NOT dbusmenu-qt5_FOUND)
 INTERFACE
     external_dbusmenu_qt_bundled
 )
-endif()

external/expected/CMakeLists.txt

@@ -16,12 +16,11 @@ if (DESKTOP_APP_USE_PACKAGED)
 
     if (tl-expected_FOUND)
         target_link_libraries(external_expected INTERFACE tl::expected)
+        return()
     endif()
 endif()
 
-if (NOT tl-expected_FOUND)
 target_include_directories(external_expected SYSTEM
 INTERFACE
     ${third_party_loc}/expected/include
 )
-endif()

external/fcitx5_qt/CMakeLists.txt

@@ -7,7 +7,9 @@
 if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
     add_library(external_fcitx5_qt INTERFACE IMPORTED GLOBAL)
     add_library(desktop-app::external_fcitx5_qt ALIAS external_fcitx5_qt)
-else()
+    return()
+endif()
+
 add_library(external_fcitx5_qt STATIC)
 add_library(desktop-app::external_fcitx5_qt ALIAS external_fcitx5_qt)
 init_target(external_fcitx5_qt "(external)")
@@ -82,4 +84,3 @@ else()
         xkbcommon
     )
 endif()
-endif()

external/fcitx5_qt/fcitx5_qt_dbusaddons/CMakeLists.txt

@@ -7,7 +7,9 @@
 if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
     add_library(external_fcitx5_qt_dbusaddons INTERFACE IMPORTED GLOBAL)
     add_library(desktop-app::external_fcitx5_qt_dbusaddons ALIAS external_fcitx5_qt_dbusaddons)
-else()
+    return()
+endif()
+
 add_library(external_fcitx5_qt_dbusaddons STATIC)
 add_library(desktop-app::external_fcitx5_qt_dbusaddons ALIAS external_fcitx5_qt_dbusaddons)
 init_target(external_fcitx5_qt_dbusaddons "(external)")
@@ -62,4 +64,3 @@ else()
 PRIVATE
     desktop-app::external_qt
 )
-endif()

external/fcitx_qt5/CMakeLists.txt

@@ -7,7 +7,9 @@
 if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
     add_library(external_fcitx_qt5 INTERFACE IMPORTED GLOBAL)
     add_library(desktop-app::external_fcitx_qt5 ALIAS external_fcitx_qt5)
-else()
+    return()
+endif()
+
 add_library(external_fcitx_qt5 STATIC)
 add_library(desktop-app::external_fcitx_qt5 ALIAS external_fcitx_qt5)
 init_target(external_fcitx_qt5 "(external)")
@@ -85,4 +87,3 @@ else()
         xkbcommon
     )
 endif()
-endif()

external/hime_qt/CMakeLists.txt

@@ -7,7 +7,9 @@
 if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
     add_library(external_hime_qt INTERFACE IMPORTED GLOBAL)
     add_library(desktop-app::external_hime_qt ALIAS external_hime_qt)
-else()
+    return()
+endif()
+
 add_library(external_hime_qt STATIC)
 add_library(desktop-app::external_hime_qt ALIAS external_hime_qt)
 init_target(external_hime_qt "(external)")
@@ -41,4 +43,3 @@ else()
     desktop-app::external_hime_im_client
     desktop-app::external_qt
 )
-endif()

external/hime_qt/hime_im_client/CMakeLists.txt

@@ -7,7 +7,9 @@
 if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
     add_library(external_hime_im_client INTERFACE IMPORTED GLOBAL)
     add_library(desktop-app::external_hime_im_client ALIAS external_hime_im_client)
-else()
+    return()
+endif()
+
 add_library(external_hime_im_client STATIC)
 add_library(desktop-app::external_hime_im_client ALIAS external_hime_im_client)
 init_target(external_hime_im_client "(external)")
@@ -32,4 +34,3 @@ else()
 PRIVATE
     ${X11_INCLUDE_DIRS}
 )
-endif()

external/hunspell/CMakeLists.txt

@@ -13,10 +13,10 @@ if (DESKTOP_APP_USE_PACKAGED)
 
     if (HUNSPELL_FOUND)
         target_link_libraries(external_hunspell INTERFACE PkgConfig::HUNSPELL)
+        return()
     endif()
 endif()
 
-if (NOT HUNSPELL_FOUND)
 add_library(external_hunspell_bundled STATIC)
 init_target(external_hunspell_bundled "(external)")
 
@@ -68,4 +68,3 @@ if (NOT HUNSPELL_FOUND)
 INTERFACE
     external_hunspell_bundled
 )
-endif()

external/lz4/CMakeLists.txt

@@ -13,10 +13,10 @@ if (DESKTOP_APP_USE_PACKAGED)
 
     if (LZ4_FOUND)
         target_link_libraries(external_lz4 INTERFACE PkgConfig::LZ4)
+        return()
     endif()
 endif()
 
-if (NOT LZ4_FOUND)
 add_library(external_lz4_bundled STATIC)
 init_target(external_lz4_bundled "(external)")
 
@@ -44,4 +44,3 @@ if (NOT LZ4_FOUND)
 INTERFACE
     external_lz4_bundled
 )
-endif()

external/minizip/CMakeLists.txt

@@ -13,11 +13,18 @@ if (DESKTOP_APP_USE_PACKAGED)
 
     if (MINIZIP_FOUND)
         target_link_libraries(external_minizip INTERFACE PkgConfig::MINIZIP)
+        return()
     endif()
 endif()
 
-if (NOT MINIZIP_FOUND)
+if (WIN32)
-    if (NOT WIN32)
+    target_include_directories(external_minizip SYSTEM
+    INTERFACE
+        ${libs_loc}/zlib/contrib/minizip
+    )
+    return()
+endif()
+
 add_library(external_minizip_bundled STATIC)
 init_target(external_minizip_bundled "(external)")
 
@@ -43,10 +50,3 @@ if (NOT MINIZIP_FOUND)
 INTERFACE
     external_minizip_bundled
 )
-    else()
-        target_include_directories(external_minizip SYSTEM
-        INTERFACE
-            ${libs_loc}/zlib/contrib/minizip
-        )
-    endif()
-endif()

external/nimf_qt5/CMakeLists.txt

@@ -7,7 +7,9 @@
 if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
     add_library(external_nimf_qt5 INTERFACE IMPORTED GLOBAL)
     add_library(desktop-app::external_nimf_qt5 ALIAS external_nimf_qt5)
-else()
+    return()
+endif()
+
 add_library(external_nimf_qt5 STATIC)
 add_library(desktop-app::external_nimf_qt5 ALIAS external_nimf_qt5)
 init_target(external_nimf_qt5 "(external)")
@@ -46,4 +48,3 @@ else()
 PRIVATE
     desktop-app::external_qt
 )
-endif()

external/openssl/openssl_crypto/CMakeLists.txt

@@ -10,7 +10,9 @@ if (DESKTOP_APP_USE_PACKAGED)
 
     find_package(OpenSSL REQUIRED)
     target_link_libraries(external_openssl_crypto INTERFACE OpenSSL::Crypto)
-else()
+    return()
+endif()
+
 add_library(external_openssl_crypto STATIC IMPORTED GLOBAL)
 add_library(desktop-app::external_openssl_crypto ALIAS external_openssl_crypto)
 
@@ -28,4 +30,3 @@ else()
 INTERFACE
     desktop-app::external_openssl_common
 )
-endif()

external/openssl/openssl_ssl/CMakeLists.txt

@@ -10,7 +10,9 @@ if (DESKTOP_APP_USE_PACKAGED)
 
     find_package(OpenSSL REQUIRED)
     target_link_libraries(external_openssl_ssl INTERFACE OpenSSL::SSL)
-else()
+    return()
+endif()
+
 add_library(external_openssl_ssl STATIC IMPORTED GLOBAL)
 add_library(desktop-app::external_openssl_ssl ALIAS external_openssl_ssl)
 
@@ -28,4 +30,3 @@ else()
 INTERFACE
     desktop-app::external_openssl_common
 )
-endif()

external/opus/CMakeLists.txt

@@ -12,7 +12,9 @@ if (DESKTOP_APP_USE_PACKAGED)
     pkg_check_modules(OPUS IMPORTED_TARGET opus)
 
     target_link_libraries(external_opus INTERFACE PkgConfig::OPUS)
-else()
+    return()
+endif()
+
 add_library(external_opus STATIC IMPORTED GLOBAL)
 add_library(desktop-app::external_opus ALIAS external_opus)
 
@@ -44,4 +46,3 @@ else()
         IMPORTED_LOCATION "${OPUS_LIBRARY}"
     )
 endif()
-endif()

external/qr_code_generator/CMakeLists.txt

@@ -14,10 +14,10 @@ if (DESKTOP_APP_USE_PACKAGED)
     if (QRCODE_LIBRARIES AND QRCODE_INCLUDE_DIRS)
         target_include_directories(external_qr_code_generator SYSTEM INTERFACE ${QRCODE_INCLUDE_DIRS})
         target_link_libraries(external_qr_code_generator INTERFACE ${QRCODE_LIBRARIES})
+        return()
     endif()
 endif()
 
-if (NOT QRCODE_LIBRARIES OR NOT QRCODE_INCLUDE_DIRS)
 add_library(external_qr_code_generator_bundled STATIC)
 init_target(external_qr_code_generator_bundled "(external)")
 
@@ -39,4 +39,3 @@ if (NOT QRCODE_LIBRARIES OR NOT QRCODE_INCLUDE_DIRS)
 INTERFACE
     external_qr_code_generator_bundled
 )
-endif()

external/qt/CMakeLists.txt

@@ -50,7 +50,10 @@ if (DESKTOP_APP_USE_PACKAGED)
             ${Qt5WaylandClient_PRIVATE_INCLUDE_DIRS}
         )
     endif()
-else()
+
+    return()
+endif()
+
 target_include_directories(external_qt SYSTEM
 INTERFACE
     ${qt_loc}/include
@@ -308,4 +311,3 @@ else()
         X11-xcb
     )
 endif()
-endif()

external/qt/qt6/CMakeLists.txt

@@ -38,7 +38,10 @@ if (DESKTOP_APP_USE_PACKAGED)
             ${Qt6WaylandClient_PRIVATE_INCLUDE_DIRS}
         )
     endif()
-else()
+
+    return()
+endif()
+
 target_include_directories(external_qt SYSTEM
 INTERFACE
     ${qt_loc}/include
@@ -283,4 +286,3 @@ else()
         X11-xcb
     )
 endif()
-endif()

external/rlottie/CMakeLists.txt

@@ -20,14 +20,16 @@ if (DESKTOP_APP_USE_PACKAGED)
             target_link_libraries(external_rlottie INTERFACE PkgConfig::RLOTTIE)
         endif()
     endif()
-endif()
 
     if (rlottie_FOUND OR RLOTTIE_FOUND)
         target_compile_definitions(external_rlottie
         INTERFACE
             DESKTOP_APP_USE_PACKAGED_RLOTTIE
         )
-else()
+        return()
+    endif()
+endif()
+
 add_library(external_rlottie_bundled STATIC)
 init_target(external_rlottie_bundled "(external)")
 
@@ -145,4 +147,3 @@ else()
 INTERFACE
     external_rlottie_bundled
 )
-endif()

external/rnnoise/CMakeLists.txt

@@ -12,7 +12,9 @@ if (DESKTOP_APP_USE_PACKAGED)
     pkg_check_modules(RNNOISE REQUIRED IMPORTED_TARGET rnnoise)
 
     target_link_libraries(external_rnnoise INTERFACE PkgConfig::RNNOISE)
-else()
+    return()
+endif()
+
 add_library(external_rnnoise STATIC IMPORTED GLOBAL)
 add_library(desktop-app::external_rnnoise ALIAS external_rnnoise)
 
@@ -45,4 +47,3 @@ else()
         IMPORTED_LOCATION "${RNNOISE_LIBRARY}"
     )
 endif()
-endif()

external/webrtc/CMakeLists.txt

@@ -10,7 +10,9 @@ add_library(desktop-app::external_webrtc ALIAS external_webrtc)
 if (DESKTOP_APP_USE_PACKAGED)
     find_package(tg_owt REQUIRED)
     target_link_libraries(external_webrtc INTERFACE tg_owt::tg_owt)
-else()
+    return()
+endif()
+
 set(webrtc_loc ${libs_loc}/tg_owt/src)
 set(webrtc_build_loc ${libs_loc}/tg_owt/out/$<IF:$<CONFIG:Debug>,Debug,Release>)
 
@@ -120,4 +122,3 @@ else()
         glib-2.0
     )
 endif()
-endif()