Browse Source

CMake: Fix WebUI checks

When the CMake system was last revamped, the configure variable was
changed from WEBUI to DISABLE_WEBUI, but we are still checking
against WEBUI. This behavior was changed in fa770871e9
adaptive-webui-19844
NotTsunami 5 years ago
parent
commit
b21ed0063b
  1. 4
      src/CMakeLists.txt
  2. 6
      src/app/CMakeLists.txt

4
src/CMakeLists.txt

@ -75,6 +75,6 @@ if (Qt5Widgets_FOUND) @@ -75,6 +75,6 @@ if (Qt5Widgets_FOUND)
add_subdirectory(gui)
endif ()
if (WEBUI)
if (NOT DISABLE_WEBUI)
add_subdirectory(webui)
endif (WEBUI)
endif()

6
src/app/CMakeLists.txt

@ -36,7 +36,7 @@ include(QbtTranslations) @@ -36,7 +36,7 @@ include(QbtTranslations)
file(GLOB QBT_TS_FILES ../lang/*.ts)
qbt_add_translations(qBittorrent QRC_FILE "../lang/lang.qrc" TS_FILES ${QBT_TS_FILES})
if (WEBUI)
if (NOT DISABLE_WEBUI)
file(GLOB QBT_WEBUI_TS_FILES ../webui/www/translations/*.ts)
qbt_add_translations(qBittorrent QRC_FILE "../webui/www/translations/webui_translations.qrc" TS_FILES ${QBT_WEBUI_TS_FILES})
endif()
@ -97,9 +97,9 @@ else(Qt5Widgets_FOUND) @@ -97,9 +97,9 @@ else(Qt5Widgets_FOUND)
)
endif (Qt5Widgets_FOUND)
if (WEBUI)
if (NOT DISABLE_WEBUI)
target_link_libraries(qBittorrent PRIVATE qbt_webui)
endif (WEBUI)
endif()
# we have to include resources into the bundle
if (APPLE)

Loading…
Cancel
Save