CMake: Don't split GUI code into several libraries

Author: glassez

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
 
 message(AUTHOR_WARNING "If the build fails, please try the autotools/qmake method.")
 
-if(POLICY CMP0074)
+if (POLICY CMP0074)
     cmake_policy(SET CMP0074 NEW)
 endif()
 
@@ -45,9 +45,9 @@ set(requiredQtVersion 5.9.0)
 set(requiredOpensslVersion 1.0)
 set(requiredLibtorrentVersion 1.1.10)
 
-if(WIN32)
+if (WIN32)
     include(winconf)
-endif(WIN32)
+endif()
 
 
 # we need options here, at the top level, because they are used not only in "src" subdir, but in the "dist" dir too

dist/CMakeLists.txt

@@ -2,11 +2,8 @@ find_package(Qt5Widgets ${requiredQtVersion}) # to conditionally install desktop
 
 if (APPLE)
     add_subdirectory(mac)
-else (APPLE)
-    if (UNIX)
-        add_subdirectory(unix)
-    endif (UNIX)
-    if (WIN32)
-        add_subdirectory(windows)
-    endif (WIN32)
-endif (APPLE)
+elseif (UNIX)
+    add_subdirectory(unix)
+elseif (WIN32)
+    add_subdirectory(windows)
+endif()

src/CMakeLists.txt

@@ -37,7 +37,7 @@ if (APPLE)
     # Workaround CMake bug (autogen does not pass required parameters to moc)
     # Relevant issue: https://gitlab.kitware.com/cmake/cmake/issues/18041
     list(APPEND CMAKE_AUTOMOC_MOC_OPTIONS -DQ_OS_MACOS -DQ_OS_DARWIN)
-endif ()
+endif()
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 

src/app/CMakeLists.txt

@@ -1,27 +1,24 @@
 add_executable(qBittorrent
-# headers
-application.h
-applicationinstancemanager.h
-cmdoptions.h
-filelogger.h
-qtlocalpeer/qtlocalpeer.h
-upgrade.h
-
-# sources
-application.cpp
-applicationinstancemanager.cpp
-cmdoptions.cpp
-filelogger.cpp
-main.cpp
-qtlocalpeer/qtlocalpeer.cpp
-upgrade.cpp
+    # headers
+    application.h
+    applicationinstancemanager.h
+    cmdoptions.h
+    filelogger.h
+    qtlocalpeer/qtlocalpeer.h
+    upgrade.h
+
+    # sources
+    application.cpp
+    applicationinstancemanager.cpp
+    cmdoptions.cpp
+    filelogger.cpp
+    main.cpp
+    qtlocalpeer/qtlocalpeer.cpp
+    upgrade.cpp
 )
 
 target_include_directories(qBittorrent PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
-target_link_libraries(qBittorrent
-    PRIVATE
-        qbt_base
-)
+target_link_libraries(qBittorrent PRIVATE qbt_base)
 
 set_target_properties(qBittorrent
     PROPERTIES
@@ -42,8 +39,8 @@ if (NOT DISABLE_WEBUI)
 endif()
 
 set(QBT_APP_RESOURCES
-../icons/icons.qrc
-../searchengine/searchengine.qrc
+    ../icons/icons.qrc
+    ../searchengine/searchengine.qrc
 )
 
 # With AUTORCC rcc is ran by cmake before language files are generated,
@@ -53,49 +50,53 @@ qt5_add_resources(QBT_APP_RESOURCE_SOURCE ${QBT_APP_RESOURCES})
 if (WIN32)
     if (MINGW)
         target_sources(qBittorrent PRIVATE ../qbittorrent_mingw.rc)
-    else (MINGW)
+    else()
         target_sources(qBittorrent PRIVATE ../qbittorrent.rc)
-    endif (MINGW)
+    endif()
+
     target_sources(qBittorrent PRIVATE ../qbittorrent.exe.manifest)
-endif (WIN32)
+endif()
 
 if (STACKTRACE)
     if (UNIX)
         target_sources(qBittorrent PRIVATE stacktrace.h)
-    else (UNIX)
+    else()
         target_sources(qBittorrent PRIVATE stacktrace_win.h)
         if (Qt5Widgets_FOUND)
             target_sources(qBittorrent PRIVATE stacktracedialog.cpp stacktracedialog.h)
-        endif (Qt5Widgets_FOUND)
+        endif()
+
         if (MSVC)
             if (NOT "${WINXXBITS}" STREQUAL "Win64")
                 # i686 arch requires frame pointer preservation
                 add_compile_options(-Oy-)
-            endif (NOT "${WINXXBITS}" STREQUAL "Win64")
+            endif()
+
             add_compile_options(-Zi)
             target_link_libraries(qBittorrent PUBLIC dbghelp -DEBUG)
-        else (MSVC)
+        else()
             if (NOT "${WINXXBITS}" STREQUAL "Win64")
                 add_compile_options(-fno-omit-frame-pointer)
-            endif (NOT "${WINXXBITS}" STREQUAL "Win64")
+            endif()
+
             target_link_libraries(qBittorrent PUBLIC dbghelp -Wl,--export-all-symbols)
-        endif (MSVC)
-    endif (UNIX)
-endif (STACKTRACE)
+        endif()
+    endif()
+endif()
 
 if (Qt5Widgets_FOUND)
-    target_link_libraries(qBittorrent PRIVATE qbt_searchengine qbt_gui)
+    target_link_libraries(qBittorrent PRIVATE qbt_gui)
     set_target_properties(qBittorrent
         PROPERTIES
             OUTPUT_NAME qbittorrent
             WIN32_EXECUTABLE True
     )
-else(Qt5Widgets_FOUND)
+else()
     set_target_properties(qBittorrent
         PROPERTIES
             OUTPUT_NAME qbittorrent-nox
     )
-endif (Qt5Widgets_FOUND)
+endif()
 
 if (NOT DISABLE_WEBUI)
     target_link_libraries(qBittorrent PRIVATE qbt_webui)
@@ -127,9 +128,8 @@ if (APPLE)
         ${QT_TR_DIR}/qt_zh_CN.qm
     )
     list(APPEND QBT_APP_RESOURCE_SOURCE ${QT_TRANSLATIONS})
-    set_source_files_properties(${QT_TRANSLATIONS}
-        PROPERTIES MACOSX_PACKAGE_LOCATION translations)
-endif (APPLE)
+    set_source_files_properties(${QT_TRANSLATIONS} PROPERTIES MACOSX_PACKAGE_LOCATION translations)
+endif()
 
 target_sources(qBittorrent PRIVATE ${QBT_QM_FILES} ${QBT_APP_RESOURCE_SOURCE})
 
@@ -138,23 +138,24 @@ get_target_property(QBT_EXECUTABLE_NAME qBittorrent OUTPUT_NAME)
 if (APPLE)
     set(qbt_BUNDLE_NAME ${QBT_EXECUTABLE_NAME})
 
-# substitute @EXECUTABLE@ in dist/mac/Info.plist
+    # substitute @EXECUTABLE@ in dist/mac/Info.plist
     set(EXECUTABLE ${qbt_BUNDLE_NAME})
     configure_file(${qBittorrent_SOURCE_DIR}/dist/mac/Info.plist ${qBittorrent_BINARY_DIR}/dist/mac/Info.plist @ONLY)
 
     set_target_properties(qBittorrent PROPERTIES
         MACOSX_BUNDLE_BUNDLE_NAME "${qbt_BUNDLE_NAME}"
         MACOSX_BUNDLE_INFO_PLIST ${qBittorrent_BINARY_DIR}/dist/mac/Info.plist
     )
-endif (APPLE)
+endif()
 
 # installation
 install(TARGETS qBittorrent
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
     BUNDLE  DESTINATION .
-    COMPONENT runtime)
+    COMPONENT runtime
+)
 
 if (Qt5Widgets_FOUND AND APPLE)
     find_package(Qt5Svg REQUIRED)
     include(bundle)
-endif (Qt5Widgets_FOUND AND APPLE)
+endif()