github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-21 05:43:32 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

CMake: Fix WebUI checks

Browse source 
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
This commit is contained in:
NotTsunami 2020-01-18 09:41:56 -05:00
commit b21ed0063b
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/CMakeLists.txt
View file

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

6
src/app/CMakeLists.txt
View file

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