diff --git a/CMakeLists.txt b/CMakeLists.txt index 8293fd754..e1bd39bb9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -145,9 +145,6 @@ include(pkgconfig_helper) # module file. include(HandleFindGit2) include(HandleFindLibDiveComputer) -if (SUBSURFACE_TARGET_EXECUTABLE MATCHES "DesktopExecutable") - include(HandleUserManual) -endif() include(HandleFtdiSupport) include(HandleVersionGeneration) include(RunOnBuildDir) @@ -249,14 +246,32 @@ if (SUBSURFACE_TARGET_EXECUTABLE MATCHES "DesktopExecutable") endif() list(APPEND QT_EXTRA_COMPONENTS QuickWidgets) remove_definitions(-DSUBSURFACE_MOBILE) + if(NO_USERMANUAL) + message(STATUS "building without built-in user manual support") + add_definitions(-DNO_USERMANUAL) + else() + set(REQUEST_WEBKIT ON) + endif() if(NO_PRINTING) message(STATUS "building without printing support") add_definitions(-DNO_PRINTING) else() - LIST(APPEND QT_EXTRA_COMPONENTS PrintSupport) + set(REQUEST_WEBKIT ON) + endif() + if(REQUEST_WEBKIT) # Because Qt5WebKitWidgets isn't a part of the "regular" Qt5, we can't get it the normal way - find_package(Qt5WebKitWidgets REQUIRED) - LIST(APPEND SUBSURFACE_LINK_LIBRARIES Qt5::WebKitWidgets) + find_package(Qt5WebKitWidgets QUIET) + if(Qt5WebKitWidgets_FOUND STREQUAL "1") + LIST(APPEND QT_EXTRA_COMPONENTS PrintSupport WebKitWidgets) + LIST(APPEND SUBSURFACE_LINK_LIBRARIES Qt5::WebKitWidgets) + message(STATUS "building with QtWebKit") + else() + message(STATUS "didn't find QtWebKit, building without user manual and printing support") + add_definitions(-DNO_PRINTING) + add_definitions(-DNO_USERMANUAL) + set(NO_PRINTING ON) + set(NO_USERMANUAL ON) + endif() endif() elseif (SUBSURFACE_TARGET_EXECUTABLE MATCHES "MobileExecutable") if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") diff --git a/cmake/Modules/HandleUserManual.cmake b/cmake/Modules/HandleUserManual.cmake deleted file mode 100644 index 226b8ca9e..000000000 --- a/cmake/Modules/HandleUserManual.cmake +++ /dev/null @@ -1,6 +0,0 @@ -if(NO_USERMANUAL) - message(STATUS "building without usermanual") - add_definitions(-DNO_USERMANUAL) -else() - list(APPEND QT_EXTRA_COMPONENTS WebKitWidgets) -endif()