blob: d7c1a6ce06a6163f8fdc0c0a8343ef6808a75041 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
--- bibletime-2.11.2.orig/CMakeLists.txt 2018-06-18 15:07:00.000000000 -0500
+++ bibletime-2.11.2/CMakeLists.txt 2020-04-10 12:50:57.857672342 -0500
@@ -156,21 +156,10 @@
ADD_DEFINITIONS("-DBT_MOBILE")
ENDIF()
-FIND_PACKAGE(Qt5WebEngine QUIET)
-IF(NOT Qt5WebEngine_FOUND)
MESSAGE(STATUS "Using Qt WebKit")
FIND_PACKAGE(Qt5WebKit REQUIRED)
FIND_PACKAGE(Qt5WebKitWidgets REQUIRED)
SET(USEWEBENGINE OFF)
-ELSE()
- MESSAGE(STATUS "Using Qt WebEngine")
- FIND_PACKAGE(Qt5WebEngineWidgets REQUIRED)
- SET(USEWEBENGINE ON)
-ENDIF()
-
-IF(USEWEBENGINE)
- ADD_DEFINITIONS("-DUSEWEBENGINE")
-ENDIF()
# Define $bibletime_SOURCES
INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/BTSourceFileList.cmake")
@@ -232,8 +221,6 @@
IF(${BIBLETIME_FRONTEND} STREQUAL "MOBILE")
TARGET_LINK_LIBRARIES("bibletime" Qt5::Widgets Qt5::WebKitWidgets Qt5::Qml Qt5::Quick Qt5::Xml Qt5::Network Qt5::PrintSupport Qt5::Svg)
-ELSEIF(USEWEBENGINE)
- TARGET_LINK_LIBRARIES("bibletime" Qt5::Widgets Qt5::WebEngine Qt5::WebEngineWidgets Qt5::WebChannel Qt5::Xml Qt5::Network Qt5::PrintSupport Qt5::Svg)
ELSE()
TARGET_LINK_LIBRARIES("bibletime" Qt5::Widgets Qt5::WebKit Qt5::WebKitWidgets Qt5::Xml Qt5::Network Qt5::PrintSupport Qt5::Svg)
ENDIF()
@@ -288,13 +275,8 @@
DESTINATION "${BT_SHARE_PATH}/bibletime/display-templates/")
-IF(USEWEBENGINE)
- INSTALL(FILES "src/frontend/display/btwebengine.js"
- DESTINATION "${BT_SHARE_PATH}/bibletime/javascript/")
-ELSE()
- INSTALL(FILES "src/frontend/display/bthtml.js"
- DESTINATION "${BT_SHARE_PATH}/bibletime/javascript/")
-ENDIF()
+INSTALL(FILES "src/frontend/display/bthtml.js"
+ DESTINATION "${BT_SHARE_PATH}/bibletime/javascript/")
INSTALL(FILES "docs/license.html"
DESTINATION "${BT_SHARE_PATH}/bibletime/license/")
|
