Skip to content

Commit 20d415b

Browse files
committed
Don't attempt to build two examples with Qt6
The lack of WebView means it can not work
1 parent 7b67cbe commit 20d415b

File tree

3 files changed

+31
-53
lines changed

3 files changed

+31
-53
lines changed

examples/CMakeLists.txt

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,23 @@ ExternalProject_Add(codegen
2424
DEPENDS books
2525
)
2626

27-
ExternalProject_Add(contacts
28-
SOURCE_DIR ${CMAKE_SOURCE_DIR}/contacts
29-
INSTALL_COMMAND ""
30-
CMAKE_ARGS
31-
-DCMAKE_PREFIX_PATH=${prefixPath}
32-
DEPENDS codegen
33-
)
27+
if (NOT GRANTLEE_BUILD_WITH_QT6)
28+
ExternalProject_Add(contacts
29+
SOURCE_DIR ${CMAKE_SOURCE_DIR}/contacts
30+
INSTALL_COMMAND ""
31+
CMAKE_ARGS
32+
-DCMAKE_PREFIX_PATH=${prefixPath}
33+
DEPENDS codegen
34+
)
3435

35-
ExternalProject_Add(htmlapps
36-
SOURCE_DIR ${CMAKE_SOURCE_DIR}/htmlapps
37-
INSTALL_COMMAND ""
38-
CMAKE_ARGS
39-
-DCMAKE_PREFIX_PATH=${prefixPath}
40-
DEPENDS contacts
41-
)
36+
ExternalProject_Add(htmlapps
37+
SOURCE_DIR ${CMAKE_SOURCE_DIR}/htmlapps
38+
INSTALL_COMMAND ""
39+
CMAKE_ARGS
40+
-DCMAKE_PREFIX_PATH=${prefixPath}
41+
DEPENDS contacts
42+
)
43+
endif()
4244

4345
ExternalProject_Add(textedit
4446
SOURCE_DIR ${CMAKE_SOURCE_DIR}/textedit

examples/contacts/CMakeLists.txt

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,14 @@ target_link_libraries(
1919
Grantlee5::Templates
2020
)
2121

22-
if (GRANTLEE_BUILD_WITH_QT6)
23-
find_package(Qt6WebKitWidgets REQUIRED)
24-
find_package(Qt6LinguistTools REQUIRED)
25-
target_link_libraries(
26-
contacts_linguist
27-
Qt6::WebKitWidgets
28-
)
29-
set(lupdate_exe Qt6::lupdate)
30-
set(lrelease_exe Qt6::lrelease)
31-
else()
32-
find_package(Qt5WebKitWidgets REQUIRED)
33-
find_package(Qt5LinguistTools REQUIRED)
34-
target_link_libraries(
35-
contacts_linguist
36-
Qt5::WebKitWidgets
37-
)
38-
set(lupdate_exe Qt5::lupdate)
39-
set(lrelease_exe Qt5::lrelease)
40-
endif()
22+
find_package(Qt5WebKitWidgets REQUIRED)
23+
find_package(Qt5LinguistTools REQUIRED)
24+
target_link_libraries(
25+
contacts_linguist
26+
Qt5::WebKitWidgets
27+
)
28+
set(lupdate_exe Qt5::lupdate)
29+
set(lrelease_exe Qt5::lrelease)
4130

4231
execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${PROJECT_SOURCE_DIR}/../../scripts" "${PROJECT_SOURCE_DIR}/scripts")
4332

examples/htmlapps/CMakeLists.txt

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,10 @@ find_package(Qt5 REQUIRED XmlPatterns Network)
2525
target_link_libraries(customplugin
2626
Grantlee5::Templates
2727
)
28-
if (GRANTLEE_BUILD_WITH_QT6)
29-
target_link_libraries(customplugin
30-
Qt6::XmlPatterns
31-
Qt6::Network
32-
)
33-
else()
34-
target_link_libraries(customplugin
35-
Qt5::XmlPatterns
36-
Qt5::Network
37-
)
38-
endif()
28+
target_link_libraries(customplugin
29+
Qt5::XmlPatterns
30+
Qt5::Network
31+
)
3932

4033
add_executable(htmlapps
4134
main.cpp
@@ -50,12 +43,6 @@ target_link_libraries(htmlapps
5043
Grantlee5::Templates
5144
)
5245

53-
if (GRANTLEE_BUILD_WITH_QT6)
54-
target_link_libraries(htmlapps
55-
Qt6::WebKitWidgets
56-
)
57-
else()
58-
target_link_libraries(htmlapps
59-
Qt5::WebKitWidgets
60-
)
61-
endif()
46+
target_link_libraries(htmlapps
47+
Qt5::WebKitWidgets
48+
)

0 commit comments

Comments
 (0)